bnx2x: Fix stop-on-error

When STOP_ON_ERROR is set driver will not compile. Even if it did,
traffic will not pass without this patch as several fields which are
verified by FW/HW on the Tx path are not properly set.

Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: Ariel Elior <Ariel.Elior@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index c99087f746a3d3025818d6678c5fd21329de7aae..2f46f181cac8d8f207c1e346ace53c13c3a0a45d 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -3874,12 +3874,16 @@ 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
        }
 
        nbd = 2; /* start_bd + pbd + frags (updated when pages are mapped) */
@@ -3952,11 +3956,22 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                              &pbd_e2->data.mac_addr.dst_mid,
                                              &pbd_e2->data.mac_addr.dst_lo,
                                              eth->h_dest);
-               } else if (bp->flags & TX_SWITCHING) {
-                       bnx2x_set_fw_mac_addr(&pbd_e2->data.mac_addr.dst_hi,
-                                             &pbd_e2->data.mac_addr.dst_mid,
-                                             &pbd_e2->data.mac_addr.dst_lo,
-                                             eth->h_dest);
+               } else {
+                       if (bp->flags & TX_SWITCHING)
+                               bnx2x_set_fw_mac_addr(
+                                               &pbd_e2->data.mac_addr.dst_hi,
+                                               &pbd_e2->data.mac_addr.dst_mid,
+                                               &pbd_e2->data.mac_addr.dst_lo,
+                                               eth->h_dest);
+#ifdef BNX2X_STOP_ON_ERROR
+                       /* Enforce security is always set in Stop on Error -
+                        * source mac should be present in the parsing BD
+                        */
+                       bnx2x_set_fw_mac_addr(&pbd_e2->data.mac_addr.src_hi,
+                                             &pbd_e2->data.mac_addr.src_mid,
+                                             &pbd_e2->data.mac_addr.src_lo,
+                                             eth->h_source);
+#endif
                }
 
                SET_FLAG(pbd_e2_parsing_data,

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 0728c02440f48b0576c397d262909f1476f09225..2f394b82ca026684e998c78e26aabcb1e663934e 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -1143,7 +1143,7 @@ void bnx2x_panic_dump(struct bnx2x *bp, bool disable_int)
                        if (!fp->txdata_ptr)
                                break;
 
-                       if (!txdata.tx_cons_sb)
+                       if (!txdata->tx_cons_sb)
                                continue;
 
                        start = TX_BD(le16_to_cpu(*txdata->tx_cons_sb) - 10);