From: Jon Maloy <jon.maloy@ericsson.com>
Date: Mon, 16 Oct 2017 14:04:51 +0000 (+0200)
Subject: tipc: fix rebasing error
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=36c0a9dfc6613242ba1de012e2d15145cdaae805;p=openwrt%2Fstaging%2Fblogic.git

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>
---

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);