The patch titled
e1000: fix mismerge skb_put()
has been added to the -mm tree. Its filename is
e1000-fix-mismerge-skb_put.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: "Kok, Auke" <auke-jan.h.kok@xxxxxxxxx>
Seems there was a bit of a fix needed to due a bad merge in the legacy
receive path. Fixes a panic due to skb_over_panic.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@xxxxxxxxx>
Signed-off-by: Auke Kok <auke-jan.h.kok@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/e1000/e1000_main.c | 3 +--
1 files changed, 1 insertion(+), 2 deletions(-)
diff -puN drivers/net/e1000/e1000_main.c~e1000-fix-mismerge-skb_put drivers/net/e1000/e1000_main.c
--- devel/drivers/net/e1000/e1000_main.c~e1000-fix-mismerge-skb_put 2006-04-18 23:32:34.000000000 -0700
+++ devel-akpm/drivers/net/e1000/e1000_main.c 2006-04-18 23:32:34.000000000 -0700
@@ -3606,8 +3606,7 @@ e1000_clean_rx_irq(struct e1000_adapter
buffer_info->skb = skb;
goto next_desc;
}
- } else
- skb_put(skb, length);
+ }
/* code added for copybreak, this should improve
* performance for small packets with large amounts
_
Patches currently in -mm which might be from auke-jan.h.kok@xxxxxxxxx are
git-netdev-all.patch
e1000-fix-mismerge-skb_put.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
