diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-04-23 08:46:05 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-04-23 08:46:05 -0700 |
| commit | 0b20751b5040ccecb7a31c57f4038cec1559ab7e (patch) | |
| tree | 2b9369b4a28c3db2e309253969b3e30e00e4328f /src/core/channel/client_channel.c | |
| parent | d7fa0ffb82cf91b0728758fb27e04b5dca4dfe47 (diff) | |
| parent | 3f2c2214b718ee61ddfd52efe922e652535aa537 (diff) | |
Merge branch 'one-pass' of github.com:ctiller/grpc into one-pass
Diffstat (limited to 'src/core/channel/client_channel.c')
| -rw-r--r-- | src/core/channel/client_channel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/channel/client_channel.c b/src/core/channel/client_channel.c index 6ad50cb944..e6b0f7bba8 100644 --- a/src/core/channel/client_channel.c +++ b/src/core/channel/client_channel.c @@ -105,7 +105,8 @@ static int prepare_activate(grpc_call_element *elem, calld->state = CALL_ACTIVE; /* create a child call */ - calld->s.active.child_call = grpc_child_channel_create_call(on_child, elem); + /* TODO(ctiller): pass the waiting op down here */ + calld->s.active.child_call = grpc_child_channel_create_call(on_child, elem, NULL); return 1; } |