netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Fainelli <f.fainelli@gmail.com>
To: <netdev@vger.kernel.org>
Cc: <davem@davemloft.net>, Florian Fainelli <f.fainelli@gmail.com>
Subject: [net-next 2/3] net: bcmgenet: fix warning on ndo_select_queue
Date: Thu, 20 Feb 2014 12:53:50 -0800	[thread overview]
Message-ID: <1392929631-7685-3-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1392929631-7685-1-git-send-email-f.fainelli@gmail.com>

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 <fengguang.wu@intel.com>
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

  parent reply	other threads:[~2014-02-20 20:54 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-20 20:53 [net-next 0/3] net: bcmgenet: warnings fixes Florian Fainelli
2014-02-20 20:53 ` [net-next 1/3] net: bcmgenet: drop checks on priv->phydev Florian Fainelli
2014-02-20 23:54   ` Sergei Shtylyov
2014-02-20 20:53 ` Florian Fainelli [this message]
2014-02-20 20:53 ` [net-next 3/3] net: bcmgenet: remove commented code in bcmgenet_xmit() Florian Fainelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1392929631-7685-3-git-send-email-f.fainelli@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).