summaryrefslogtreecommitdiff
path: root/net/tipc
diff options
context:
space:
mode:
authorJon Maloy <jon.maloy@ericsson.com>2017-10-16 16:04:51 +0200
committerDavid S. Miller <davem@davemloft.net>2017-10-16 21:28:36 +0100
commit36c0a9dfc6613242ba1de012e2d15145cdaae805 (patch)
tree6a4c5a4d6c49adadb3660638f9a30e8a72cf215e /net/tipc
parent45880485a3c58a4fc40734e23ddfbe786dfac072 (diff)
tipc: fix rebasing error
In commit 2f487712b893 ("tipc: guarantee that group broadcast doesn't bypass group unicast") there was introduced a last-minute rebasing error that broke non-group communication. We fix this here. Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/link.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 723dd6998684..870b9b8f877a 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -1052,6 +1052,7 @@ static bool tipc_data_input(struct tipc_link *l, struct sk_buff *skb,
return true;
}
case CONN_MANAGER:
+ skb_queue_tail(inputq, skb);
return true;
case GROUP_PROTOCOL:
skb_queue_tail(mc_inputq, skb);