Commit 36c0a9df authored Oct 16, 2017 by Jon Maloy Committed by David S. Miller Oct 16, 2017

tipc: fix rebasing error



In commit 2f487712 ("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>

parent 45880485

net/tipc/link.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);