|  | @@ -85,8 +85,8 @@ static void monitor_subchannel(grpc_exec_ctx *exec_ctx, void *arg,
 | 
	
		
			
				|  |  |                                chand->subchannel_connectivity,
 | 
	
		
			
				|  |  |                                "uchannel_monitor_subchannel");
 | 
	
		
			
				|  |  |    grpc_connected_subchannel_notify_on_state_change(
 | 
	
		
			
				|  |  | -      exec_ctx, chand->connected_subchannel, NULL, &chand->subchannel_connectivity,
 | 
	
		
			
				|  |  | -      &chand->connectivity_cb);
 | 
	
		
			
				|  |  | +      exec_ctx, chand->connected_subchannel, NULL,
 | 
	
		
			
				|  |  | +      &chand->subchannel_connectivity, &chand->connectivity_cb);
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  static char *cuc_get_peer(grpc_exec_ctx *exec_ctx, grpc_call_element *elem) {
 | 
	
	
		
			
				|  | @@ -168,10 +168,12 @@ static void cuc_destroy_channel_elem(grpc_exec_ctx *exec_ctx,
 | 
	
		
			
				|  |  |    channel_data *chand = elem->channel_data;
 | 
	
		
			
				|  |  |    /* cancel subscription */
 | 
	
		
			
				|  |  |    grpc_connected_subchannel_notify_on_state_change(
 | 
	
		
			
				|  |  | -      exec_ctx, chand->connected_subchannel, NULL, NULL, &chand->connectivity_cb);
 | 
	
		
			
				|  |  | +      exec_ctx, chand->connected_subchannel, NULL, NULL,
 | 
	
		
			
				|  |  | +      &chand->connectivity_cb);
 | 
	
		
			
				|  |  |    grpc_connectivity_state_destroy(exec_ctx, &chand->state_tracker);
 | 
	
		
			
				|  |  |    gpr_mu_destroy(&chand->mu_state);
 | 
	
		
			
				|  |  | -  GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, chand->connected_subchannel, "uchannel");
 | 
	
		
			
				|  |  | +  GRPC_CONNECTED_SUBCHANNEL_UNREF(exec_ctx, chand->connected_subchannel,
 | 
	
		
			
				|  |  | +                                  "uchannel");
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  static void cuc_set_pollset(grpc_exec_ctx *exec_ctx, grpc_call_element *elem,
 |