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 723dd6998684d96ab88fbbe195f9ef958e32a94a..870b9b8f877a2f61e7fd22df1e1a17a35f4e1460 100644 (file)
--- 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);