diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-31 14:20:01 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-31 14:20:01 -0700 |
| commit | 7e0c2f8301e6f76f5e8d38d1a3f891da20147c39 (patch) | |
| tree | cf21380503e17debfbbcecb803af26a5d36897b3 /src/core/ext/client_channel/subchannel.c | |
| parent | cb356b26eaf8cfde85166a7f6a4b3b8b6b52f839 (diff) | |
| parent | ccc6a9cbf264655ae6b60727cd86b987a62977c9 (diff) | |
Merge remote-tracking branch 'upstream/master' into lb_policy_name_channel_arg
Diffstat (limited to 'src/core/ext/client_channel/subchannel.c')
| -rw-r--r-- | src/core/ext/client_channel/subchannel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/ext/client_channel/subchannel.c b/src/core/ext/client_channel/subchannel.c index ab6aede23a..789966cb69 100644 --- a/src/core/ext/client_channel/subchannel.c +++ b/src/core/ext/client_channel/subchannel.c @@ -183,9 +183,10 @@ static void connection_destroy(grpc_exec_ctx *exec_ctx, void *arg, gpr_free(c); } -void grpc_connected_subchannel_ref( +grpc_connected_subchannel *grpc_connected_subchannel_ref( grpc_connected_subchannel *c GRPC_SUBCHANNEL_REF_EXTRA_ARGS) { GRPC_CHANNEL_STACK_REF(CHANNEL_STACK_FROM_CONNECTION(c), REF_REASON); + return c; } void grpc_connected_subchannel_unref(grpc_exec_ctx *exec_ctx, |