aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sky2.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/sky2.c')
-rw-r--r--drivers/net/sky2.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 805a7dcf5508..67ebc05d9d19 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1239,13 +1239,6 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
1239 /* Check for TCP Segmentation Offload */ 1239 /* Check for TCP Segmentation Offload */
1240 mss = skb_shinfo(skb)->gso_size; 1240 mss = skb_shinfo(skb)->gso_size;
1241 if (mss != 0) { 1241 if (mss != 0) {
1242 /* just drop the packet if non-linear expansion fails */
1243 if (skb_header_cloned(skb) &&
1244 pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {
1245 dev_kfree_skb(skb);
1246 goto out_unlock;
1247 }
1248
1249 mss += ((skb->h.th->doff - 5) * 4); /* TCP options */ 1242 mss += ((skb->h.th->doff - 5) * 4); /* TCP options */
1250 mss += (skb->nh.iph->ihl * 4) + sizeof(struct tcphdr); 1243 mss += (skb->nh.iph->ihl * 4) + sizeof(struct tcphdr);
1251 mss += ETH_HLEN; 1244 mss += ETH_HLEN;
@@ -1341,7 +1334,6 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
1341 1334
1342 sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod); 1335 sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod);
1343 1336
1344out_unlock:
1345 spin_unlock(&sky2->tx_lock); 1337 spin_unlock(&sky2->tx_lock);
1346 1338
1347 dev->trans_start = jiffies; 1339 dev->trans_start = jiffies;