diff options
| author | Dmitry Kravkov | 2012-10-16 03:28:27 +0200 |
|---|---|---|
| committer | David S. Miller | 2012-10-16 20:41:47 +0200 |
| commit | 2384d6aa079de7c16c7877220d3cd4c6f4f50767 (patch) | |
| tree | aaf7b4f52b707f74d8e02293903cffaa323817c5 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | |
| parent | qeth: fix deadlock between recovery and bonding driver (diff) | |
| download | kernel-qcow2-linux-2384d6aa079de7c16c7877220d3cd4c6f4f50767.tar.gz kernel-qcow2-linux-2384d6aa079de7c16c7877220d3cd4c6f4f50767.tar.xz kernel-qcow2-linux-2384d6aa079de7c16c7877220d3cd4c6f4f50767.zip | |
bnx2x: fix handling mf storage modes
Since commit a3348722 AFEX FCoE function is continuously reset.
The patch prevents the resetting and removes debug print
to stop garbaging syslog.
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
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 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index 24220992413f..4833b6a9031c 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -2957,9 +2957,13 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) skb_shinfo(skb)->nr_frags + BDS_PER_TX_PKT + NEXT_CNT_PER_TX_PKT(MAX_BDS_PER_TX_PKT))) { - bnx2x_fp_qstats(bp, txdata->parent_fp)->driver_xoff++; - netif_tx_stop_queue(txq); - BNX2X_ERR("BUG! Tx ring full when queue awake!\n"); + /* Handle special storage cases separately */ + if (txdata->tx_ring_size != 0) { + BNX2X_ERR("BUG! Tx ring full when queue awake!\n"); + bnx2x_fp_qstats(bp, txdata->parent_fp)->driver_xoff++; + netif_tx_stop_queue(txq); + } + return NETDEV_TX_BUSY; } |