* [net-next 1/1] tipc: fix rebasing error
@ 2017-10-16 14:04 Jon Maloy
2017-10-16 20:29 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jon Maloy @ 2017-10-16 14:04 UTC (permalink / raw)
To: davem, netdev; +Cc: parthasarathy.bhuvaragan, ying.xue, tipc-discussion
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>
---
net/tipc/link.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/tipc/link.c b/net/tipc/link.c
index 723dd69..870b9b8 100644
--- 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);
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [net-next 1/1] tipc: fix rebasing error
2017-10-16 14:04 [net-next 1/1] tipc: fix rebasing error Jon Maloy
@ 2017-10-16 20:29 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-10-16 20:29 UTC (permalink / raw)
To: jon.maloy; +Cc: netdev, parthasarathy.bhuvaragan, ying.xue, tipc-discussion
From: Jon Maloy <jon.maloy@ericsson.com>
Date: Mon, 16 Oct 2017 16:04:51 +0200
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-10-16 20:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-16 14:04 [net-next 1/1] tipc: fix rebasing error Jon Maloy
2017-10-16 20:29 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).