aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorAuke Kok <auke-jan.h.kok@intel.com>2006-04-18 15:31:04 -0400
committerAuke Kok <juke-jan.h.kok@intel.com>2006-04-18 15:31:04 -0400
commit1cb5821f444cadbe94453282f9f4767cf8744a8e (patch)
treeb23e6c848614a7ca67248eaf4e8ec9b50c092075 /drivers/net/e1000
parentdc86d32ab51c4ad3086472457fb90b61249d91f5 (diff)
e1000: fix mismerge skb_put.
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@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 2b8bced0cf64..fb8cef619142 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3585,8 +3585,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
3585 buffer_info->skb = skb; 3585 buffer_info->skb = skb;
3586 goto next_desc; 3586 goto next_desc;
3587 } 3587 }
3588 } else 3588 }
3589 skb_put(skb, length);
3590 3589
3591 /* code added for copybreak, this should improve 3590 /* code added for copybreak, this should improve
3592 * performance for small packets with large amounts 3591 * performance for small packets with large amounts