Thread (5 messages) flat view 5 messages, 2 authors, 2014-02-20

[net-next 2/3] net: bcmgenet: fix warning on ndo_select_queue

From: Florian Fainelli <f.fainelli@gmail.com>
Date: 2014-02-20 20:54:20
Subsystem: broadcom genet ethernet driver, networking drivers, the rest · Maintainers: Doug Berger, Florian Fainelli, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

Commit 99932d4 ("netdevice: add queue selection fallback handler for
ndo_select_queue") added a new argument to the ndo_select_queue callback,
but the BCMGENET driver was not updated accordingly and hence would
trigger a warning.

Reported-by: Fengguang Wu <redacted>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 8af5f07..7c023af 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -2276,7 +2276,8 @@ static int bcmgenet_set_mac_addr(struct net_device *dev, void *p)
 }
 
 static u16 bcmgenet_select_queue(struct net_device *dev,
-		struct sk_buff *skb, void *accel_priv)
+		struct sk_buff *skb, void *accel_priv,
+		select_queue_fallback_t fallback)
 {
 	return netif_is_multiqueue(dev) ? skb->queue_mapping : 0;
 }
-- 
1.8.3.2
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help