[BNX2X]: Fix Xmit bugs

Several endianity corrections in start_xmit()

Fixed TSO bug where packets were missing the TCP flags.

Signed-off-by: Eliezer Tamir <eliezert@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 10 insertions, 5 deletions

diff --git a/drivers/net/bnx2x.c b/drivers/net/bnx2x.c
index d21599cfeb89..2db0427b0c92 100644
--- a/drivers/net/bnx2x.c
+++ b/drivers/net/bnx2x.c
@@ -9269,7 +9269,7 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
                 /* for now NS flag is not used in Linux */
                 pbd->global_data = (len |
-                                    ((skb->protocol == ETH_P_8021Q) <<
+                                    ((skb->protocol == ntohs(ETH_P_8021Q)) <<
                                      ETH_TX_PARSE_BD_LLC_SNAP_EN_SHIFT));
                 pbd->ip_hlen = ip_hdrlen(skb) / 2;
                 pbd->total_hlen = cpu_to_le16(len + pbd->ip_hlen);
@@ -9278,7 +9278,7 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
                         tx_bd->bd_flags.as_bitfield |=
                                                 ETH_TX_BD_FLAGS_TCP_CSUM;
-                        pbd->tcp_flags = htonl(tcp_flag_word(skb)) & 0xFFFF;
+                        pbd->tcp_flags = pbd_tcp_flags(skb);
                         pbd->total_hlen += cpu_to_le16(tcp_hdrlen(skb) / 2);
                         pbd->tcp_pseudo_csum = swab16(th->check);
 
@@ -9322,7 +9322,7 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         if (skb_shinfo(skb)->gso_size &&
             (skb->len > (bp->dev->mtu + ETH_HLEN))) {
-                int hlen = 2 * le32_to_cpu(pbd->total_hlen);
+                int hlen = 2 * le16_to_cpu(pbd->total_hlen);
 
                 DP(NETIF_MSG_TX_QUEUED,
                    "TSO packet len %d  hlen %d  total len %d  tso size %d\n",
@@ -9439,9 +9439,11 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         DP(NETIF_MSG_TX_QUEUED, "doorbell: nbd %u  bd %d\n", nbd, bd_prod);
 
-        fp->hw_tx_prods->bds_prod += cpu_to_le16(nbd);
+        fp->hw_tx_prods->bds_prod =
+                cpu_to_le16(le16_to_cpu(fp->hw_tx_prods->bds_prod) + nbd);
         mb(); /* FW restriction: must not reorder writing nbd and packets */
-        fp->hw_tx_prods->packets_prod += cpu_to_le32(1);
+        fp->hw_tx_prods->packets_prod =
+                cpu_to_le32(le32_to_cpu(fp->hw_tx_prods->packets_prod) + 1);
         DOORBELL(bp, fp_index, 0);
 
         mmiowb();
diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h
index 6a86afbc7525..4f0c0d31e7c1 100644
--- a/drivers/net/bnx2x.h
+++ b/drivers/net/bnx2x.h
@@ -869,6 +869,9 @@ struct bnx2x {
 #define PCICFG_LINK_SPEED_SHIFT         16
 
 #define BMAC_CONTROL_RX_ENABLE          2
+
+#define pbd_tcp_flags(skb)      (ntohl(tcp_flag_word(tcp_hdr(skb)))>>16 & 0xff)
+
 /* stuff added to make the code fit 80Col */
 
 #define TPA_TYPE_START                  ETH_FAST_PATH_RX_CQE_START_FLG