openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Dmitry Kravkov 2012-10-16 01:28:27 +00:00 committed by David S. Miller
parent 2efaf5ff7f
commit 2384d6aa07
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
View File

@ -2957,9 +2957,13 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
skb_shinfo(skb)->nr_frags + skb_shinfo(skb)->nr_frags +
BDS_PER_TX_PKT + BDS_PER_TX_PKT +
NEXT_CNT_PER_TX_PKT(MAX_BDS_PER_TX_PKT))) { NEXT_CNT_PER_TX_PKT(MAX_BDS_PER_TX_PKT))) {
bnx2x_fp_qstats(bp, txdata->parent_fp)->driver_xoff++; /* Handle special storage cases separately */
netif_tx_stop_queue(txq); if (txdata->tx_ring_size != 0) {
BNX2X_ERR("BUG! Tx ring full when queue awake!\n"); 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; return NETDEV_TX_BUSY;
} }

2
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
View File

@ -126,7 +126,7 @@ static inline int bnx2x_exe_queue_add(struct bnx2x *bp,
/* Check if this request is ok */ /* Check if this request is ok */
rc = o->validate(bp, o->owner, elem); rc = o->validate(bp, o->owner, elem);
if (rc) { if (rc) {
BNX2X_ERR("Preamble failed: %d\n", rc); DP(BNX2X_MSG_SP, "Preamble failed: %d\n", rc);
goto free_and_exit; goto free_and_exit;
} }
} }