From 10119b9c47e43cb8dfb48e621063c1d093c90e23 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Thu, 9 Oct 2008 12:24:39 -0700
Subject: [PATCH] --- yaml --- r: 112227 b: refs/heads/master c:
 a1efb4b686babf38e5e63add8b990f18e38becc4 h: refs/heads/master i:   112225:
 6f11c3ce5d03092f77b5bcf01401b3c774bdc05a   112223:
 06ccbaf9a75f461cfd693b936e61f40f8ab35697 v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/net/bnx2.c | 16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 98107e8215f3..62d97d8d5ec2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5321e309c2fd1a1d534fc7bb674a1fff9f25d94
+refs/heads/master: a1efb4b686babf38e5e63add8b990f18e38becc4
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index 21711c753a09..f147204e1e47 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -6008,7 +6008,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	}
 #endif
 	if ((mss = skb_shinfo(skb)->gso_size)) {
-		u32 tcp_opt_len, ip_tcp_len;
+		u32 tcp_opt_len;
 		struct iphdr *iph;
 
 		vlan_tag_flags |= TX_BD_FLAGS_SW_LSO;
@@ -6032,21 +6032,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
 				mss |= (tcp_off & 0xc) << TX_BD_TCP6_OFF2_SHL;
 			}
 		} else {
-			if (skb_header_cloned(skb) &&
-			    pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {
-				dev_kfree_skb(skb);
-				return NETDEV_TX_OK;
-			}
-
-			ip_tcp_len = ip_hdrlen(skb) + sizeof(struct tcphdr);
-
 			iph = ip_hdr(skb);
-			iph->check = 0;
-			iph->tot_len = htons(mss + ip_tcp_len + tcp_opt_len);
-			tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr,
-								 iph->daddr, 0,
-								 IPPROTO_TCP,
-								 0);
 			if (tcp_opt_len || (iph->ihl > 5)) {
 				vlan_tag_flags |= ((iph->ihl - 5) +
 						   (tcp_opt_len >> 2)) << 8;