diff mbox series

[net] bonding: fix warning message

Message ID 20181002191434.188912-1-mahesh@bandewar.net
State Accepted, archived
Delegated to: David Miller
Headers show
Series [net] bonding: fix warning message | expand

Commit Message

Mahesh Bandewar Oct. 2, 2018, 7:14 p.m. UTC 
From: Mahesh Bandewar <maheshb@google.com>

RX queue config for bonding master could be different from its slave
device(s). With the commit 6a9e461f6fe4 ("bonding: pass link-local
packets to bonding master also."), the packet is reinjected into stack
with skb->dev as bonding master. This potentially triggers the
message:

   "bondX received packet on queue Y, but number of RX queues is Z"

whenever the queue that packet is received on is higher than the
numrxqueues on bonding master (Y > Z).

Fixes: 6a9e461f6fe4 ("bonding: pass link-local packets to bonding master also.")
Reported-by: John Sperbeck <jsperbeck@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Mahesh Bandewar <maheshb@google.com>
---
 drivers/net/bonding/bond_main.c | 1 +
 1 file changed, 1 insertion(+)

Comments

David Miller Oct. 2, 2018, 10:55 p.m. UTC | #1 
From: Mahesh Bandewar <mahesh@bandewar.net>
Date: Tue,  2 Oct 2018 12:14:34 -0700

> From: Mahesh Bandewar <maheshb@google.com>
> 
> RX queue config for bonding master could be different from its slave
> device(s). With the commit 6a9e461f6fe4 ("bonding: pass link-local
> packets to bonding master also."), the packet is reinjected into stack
> with skb->dev as bonding master. This potentially triggers the
> message:
> 
>    "bondX received packet on queue Y, but number of RX queues is Z"
> 
> whenever the queue that packet is received on is higher than the
> numrxqueues on bonding master (Y > Z).
> 
> Fixes: 6a9e461f6fe4 ("bonding: pass link-local packets to bonding master also.")
> Reported-by: John Sperbeck <jsperbeck@google.com>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Signed-off-by: Mahesh Bandewar <maheshb@google.com>

Applied.
diff mbox series

Patch

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index c05c01a00755..ee28ec9e0aba 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1187,6 +1187,7 @@  static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
 
 		if (nskb) {
 			nskb->dev = bond->dev;
+			nskb->queue_mapping = 0;
 			netif_rx(nskb);
 		}
 		return RX_HANDLER_PASS;