瀏覽代碼

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>
Jon Maloy 7 年之前
父節點
當前提交
36c0a9dfc6
共有 1 個文件被更改,包括 1 次插入0 次删除
  1. 1 0
      net/tipc/link.c

+ 1 - 0
net/tipc/link.c

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