提交 36c0a9df 编写于 作者: J Jon Maloy 提交者: David S. Miller

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: NJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 45880485
...@@ -1052,6 +1052,7 @@ static bool tipc_data_input(struct tipc_link *l, struct sk_buff *skb, ...@@ -1052,6 +1052,7 @@ static bool tipc_data_input(struct tipc_link *l, struct sk_buff *skb,
return true; return true;
} }
case CONN_MANAGER: case CONN_MANAGER:
skb_queue_tail(inputq, skb);
return true; return true;
case GROUP_PROTOCOL: case GROUP_PROTOCOL:
skb_queue_tail(mc_inputq, skb); skb_queue_tail(mc_inputq, skb);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册