From: shemminger@osdl.org
To: Jeff Garzik <jgarzik@pobox.com>
Cc: netdev@vger.kernel.org
Subject: [PATCH 1/9] sky2: remove cloned/pskb_expand_head check
Date: Mon, 28 Aug 2006 10:00:45 -0700 [thread overview]
Message-ID: <20060828170214.888770919@localhost.localdomain> (raw)
In-Reply-To: 20060828170044.136391412@localhost.localdomain
[-- Attachment #1: sky2-no-overwrite.patch --]
[-- Type: text/plain, Size: 1173 bytes --]
The code to handle cloned skb overwriting is unnecessary in the
sky2 driver and is buggy. The bug is that pskb_expand_head can change the
skb but the driver has already mapped in the header.
Since the sky2 hardware doesn't need to overwrite memory, the buggy
code can just be removed; it was mistakenly copied from the tg3
driver.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
--- sky2.orig/drivers/net/sky2.c 2006-08-25 16:00:28.000000000 -0700
+++ sky2/drivers/net/sky2.c 2006-08-25 16:01:33.000000000 -0700
@@ -1239,13 +1239,6 @@
/* 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 @@
sky2_put_idx(hw, txqaddr[sky2->port], sky2->tx_prod);
-out_unlock:
spin_unlock(&sky2->tx_lock);
dev->trans_start = jiffies;
--
Stephen Hemminger <shemminger@osdl.org>
next prev parent reply other threads:[~2006-08-28 18:20 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-28 17:00 [PATCH 0/9] sky2 1.7 non-critical bug fixes shemminger
2006-08-28 17:00 ` shemminger [this message]
2006-08-29 21:18 ` [PATCH 1/9] sky2: remove cloned/pskb_expand_head check Jeff Garzik
2006-08-28 17:00 ` [PATCH 2/9] sky2: use netdev_alloc_skb shemminger
2006-08-28 17:00 ` [PATCH 3/9] sky2: dont use force status bit shemminger
2006-08-28 17:00 ` [PATCH 4/9] sky2: MSI test timing shemminger
2006-08-28 17:00 ` [PATCH 5/9] sky2: TSO mss optimization shemminger
2006-08-28 17:00 ` [PATCH 6/9] sky2: optimize checksum offload information shemminger
2006-08-28 17:00 ` [PATCH 7/9] sky2: power down PHY when not up shemminger
2006-08-29 21:04 ` Jeff Garzik
2006-08-29 21:11 ` Stephen Hemminger
2006-08-28 17:00 ` [PATCH 8/9] sky2: pci post bug shemminger
2006-08-28 17:00 ` [PATCH 9/9] sky2: version 1.7 shemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060828170214.888770919@localhost.localdomain \
--to=shemminger@osdl.org \
--cc=jgarzik@pobox.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox