Skip to content

Commit

Permalink
tipc: fix rebasing error
Browse files Browse the repository at this point in the history
In commit 2f48771 ("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>
  • Loading branch information
Jon Maloy authored and David S. Miller committed Oct 16, 2017
1 parent 4588048 commit 36c0a9d
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions net/tipc/link.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 36c0a9d

Please sign in to comment.