bonding: fix warning message
authorMahesh Bandewar <maheshb@google.com>
Tue, 2 Oct 2018 19:14:34 +0000 (12:14 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Oct 2018 22:55:16 +0000 (15:55 -0700)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_main.c

index c05c01a..ee28ec9 100644 (file)
@@ -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;