diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-10-11 23:33:37 +0200 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-10-11 23:33:37 +0200 |
| commit | 16d185eee470cf2dc3e909a59132893abfdd4b11 (patch) | |
| tree | e48bdb15a5e30feb76a3eed812054b836166b2b5 /net/tipc/socket.c | |
| parent | 0a9cbce798bca52bb3476cb55ce33da27e100f3e (diff) | |
| parent | be2a76aecfc5ed58ddf8925190cc1cfb519bf932 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
kernel/cpuset.c
Diffstat (limited to 'net/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 9b713e0ce00d..b26b7a127773 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -2111,7 +2111,8 @@ restart: TIPC_CONN_MSG, SHORT_H_SIZE, 0, dnode, onode, dport, oport, TIPC_CONN_SHUTDOWN); - tipc_node_xmit_skb(net, skb, dnode, tsk->portid); + if (skb) + tipc_node_xmit_skb(net, skb, dnode, tsk->portid); } tsk->connected = 0; sock->state = SS_DISCONNECTING; |