diff options
| author | Yuval Mintz | 2013-01-14 06:11:47 +0100 |
|---|---|---|
| committer | David S. Miller | 2013-01-15 21:07:59 +0100 |
| commit | 823e1d90797552687d2dfab2299464e5b663a8a9 (patch) | |
| tree | 9e9e60c64cb49ffb87ceadb6495763fa463b276a /drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | |
| parent | bnx2x: add `ethtool -w' support. (diff) | |
| download | kernel-qcow2-linux-823e1d90797552687d2dfab2299464e5b663a8a9.tar.gz kernel-qcow2-linux-823e1d90797552687d2dfab2299464e5b663a8a9.tar.xz kernel-qcow2-linux-823e1d90797552687d2dfab2299464e5b663a8a9.zip | |
bnx2x: improve stop-on-error
Get better control over interrupts during panic, and allow FW to
test outgoing Tx packets when stop-on-error is allowed.
Signed-off-by: Yuval Mintz <yuvalmin@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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index 6312e636e37b..5409b303a69b 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -3535,13 +3535,17 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev) /* when transmitting in a vf, start bd must hold the ethertype * for fw to enforce it */ +#ifndef BNX2X_STOP_ON_ERROR if (IS_VF(bp)) { +#endif tx_start_bd->vlan_or_ethertype = cpu_to_le16(ntohs(eth->h_proto)); +#ifndef BNX2X_STOP_ON_ERROR } else { /* used by FW for packet accounting */ tx_start_bd->vlan_or_ethertype = cpu_to_le16(pkt_prod); } +#endif } /* turn on parsing and get a BD */ |