From e08ad7848db31af34cb49aebc4e8acc4863facbb Mon Sep 17 00:00:00 2001 From: "shemminger@osdl.org" Date: Mon, 28 Aug 2006 10:00:45 -0700 Subject: [PATCH] --- yaml --- r: 35182 b: refs/heads/master c: fba5008cda606488cf42b60de60b4414cc2276ad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/sky2.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 3e9b93ff0df3..880507f6f745 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 699a71238856b19091503c671bac8abb1e3f9a3a +refs/heads/master: fba5008cda606488cf42b60de60b4414cc2276ad diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index 805a7dcf5508..67ebc05d9d19 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/drivers/net/sky2.c @@ -1239,13 +1239,6 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev) /* Check for TCP Segmentation Offload */ mss = skb_shinfo(skb)->gso_size; if (mss != 0) { - /* just drop the packet if non-linear expansion fails */ - if (skb_header_cloned(skb) && - pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) { - dev_kfree_skb(skb); - goto out_unlock; - } - mss += ((skb->h.th->doff - 5) * 4); /* TCP options */ mss += (skb->nh.iph->ihl * 4) + sizeof(struct tcphdr); mss += ETH_HLEN; @@ -1341,7 +1334,6 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev) sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod); -out_unlock: spin_unlock(&sky2->tx_lock); dev->trans_start = jiffies;