diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-10-05 14:53:08 +0200 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-10-05 14:53:08 +0200 |
| commit | be2a76aecfc5ed58ddf8925190cc1cfb519bf932 (patch) | |
| tree | aaeeec8a45d7be02a3fdc00f6f63273a0df6f7e2 /net/tipc | |
| parent | 10fd238c91a8dd2fb9c9bce99eb4d357254fb3c6 (diff) | |
| parent | d19e48fe5da7b83d02ed4aec3567f08ae02a168c (diff) | |
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
Diffstat (limited to 'net/tipc')
| -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; |