tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by

Eliezer Tamir and committed by
David S. Miller 96fc1784 e8717a47

+10 -5
+7 -5
drivers/net/bnx2x.c
··· 9269 9269 9270 9270 /* for now NS flag is not used in Linux */ 9271 9271 pbd->global_data = (len | 9272 - ((skb->protocol == ETH_P_8021Q) << 9272 + ((skb->protocol == ntohs(ETH_P_8021Q)) << 9273 9273 ETH_TX_PARSE_BD_LLC_SNAP_EN_SHIFT)); 9274 9274 pbd->ip_hlen = ip_hdrlen(skb) / 2; 9275 9275 pbd->total_hlen = cpu_to_le16(len + pbd->ip_hlen); ··· 9278 9278 9279 9279 tx_bd->bd_flags.as_bitfield |= 9280 9280 ETH_TX_BD_FLAGS_TCP_CSUM; 9281 - pbd->tcp_flags = htonl(tcp_flag_word(skb)) & 0xFFFF; 9281 + pbd->tcp_flags = pbd_tcp_flags(skb); 9282 9282 pbd->total_hlen += cpu_to_le16(tcp_hdrlen(skb) / 2); 9283 9283 pbd->tcp_pseudo_csum = swab16(th->check); 9284 9284 ··· 9322 9322 9323 9323 if (skb_shinfo(skb)->gso_size && 9324 9324 (skb->len > (bp->dev->mtu + ETH_HLEN))) { 9325 - int hlen = 2 * le32_to_cpu(pbd->total_hlen); 9325 + int hlen = 2 * le16_to_cpu(pbd->total_hlen); 9326 9326 9327 9327 DP(NETIF_MSG_TX_QUEUED, 9328 9328 "TSO packet len %d hlen %d total len %d tso size %d\n", ··· 9439 9439 9440 9440 DP(NETIF_MSG_TX_QUEUED, "doorbell: nbd %u bd %d\n", nbd, bd_prod); 9441 9441 9442 - fp->hw_tx_prods->bds_prod += cpu_to_le16(nbd); 9442 + fp->hw_tx_prods->bds_prod = 9443 + cpu_to_le16(le16_to_cpu(fp->hw_tx_prods->bds_prod) + nbd); 9443 9444 mb(); /* FW restriction: must not reorder writing nbd and packets */ 9444 - fp->hw_tx_prods->packets_prod += cpu_to_le32(1); 9445 + fp->hw_tx_prods->packets_prod = 9446 + cpu_to_le32(le32_to_cpu(fp->hw_tx_prods->packets_prod) + 1); 9445 9447 DOORBELL(bp, fp_index, 0); 9446 9448 9447 9449 mmiowb();
+3
drivers/net/bnx2x.h
··· 869 869 #define PCICFG_LINK_SPEED_SHIFT 16 870 870 871 871 #define BMAC_CONTROL_RX_ENABLE 2 872 + 873 + #define pbd_tcp_flags(skb) (ntohl(tcp_flag_word(tcp_hdr(skb)))>>16 & 0xff) 874 + 872 875 /* stuff added to make the code fit 80Col */ 873 876 874 877 #define TPA_TYPE_START ETH_FAST_PATH_RX_CQE_START_FLG