aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMahesh Bandewar <maheshb@google.com>2018-10-02 15:14:34 -0400
committerDavid S. Miller <davem@davemloft.net>2018-10-02 18:55:16 -0400
commit0f3b914c9cfcd7bbedd445dc4ac5dd999fa213c2 (patch)
tree453744a5f0d1d153bd70e0d6f7a018054067eb0f
parent2ab2ddd301a22ca3c5f0b743593e4ad2953dfa53 (diff)
bonding: fix warning message
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>
-rw-r--r--drivers/net/bonding/bond_main.c1
1 files changed, 1 insertions, 0 deletions
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)
1187 1187
1188 if (nskb) { 1188 if (nskb) {
1189 nskb->dev = bond->dev; 1189 nskb->dev = bond->dev;
1190 nskb->queue_mapping = 0;
1190 netif_rx(nskb); 1191 netif_rx(nskb);
1191 } 1192 }
1192 return RX_HANDLER_PASS; 1193 return RX_HANDLER_PASS;