diff options
| author | David S. Miller <davem@davemloft.net> | 2014-02-19 01:24:22 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-19 01:24:22 -0500 |
| commit | 1e8d6421cff2c24fe0b345711e7a21af02e8bcf5 (patch) | |
| tree | 773b30106efb9b48055bc93958e5a94ac53768ce /drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | |
| parent | f7b12606b5de323a2bb5ca1696558efde8f25441 (diff) | |
| parent | 960dfc4eb23a28495276b02604d7458e0e1a1ed8 (diff) | |
| download | linux-1e8d6421cff2c24fe0b345711e7a21af02e8bcf5.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/bonding/bond_3ad.h
drivers/net/bonding/bond_main.c
Two minor conflicts in bonding, both of which were overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index 8363b9de5004..5ee13af78e53 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -1867,7 +1867,7 @@ void bnx2x_netif_stop(struct bnx2x *bp, int disable_hw) } u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb, - void *accel_priv) + void *accel_priv, select_queue_fallback_t fallback) { struct bnx2x *bp = netdev_priv(dev); @@ -1889,7 +1889,7 @@ u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb, } /* select a non-FCoE queue */ - return __netdev_pick_tx(dev, skb) % BNX2X_NUM_ETH_QUEUES(bp); + return fallback(dev, skb) % BNX2X_NUM_ETH_QUEUES(bp); } void bnx2x_set_num_queues(struct bnx2x *bp) |