diff options
| author |   Auke Kok <auke-jan.h.kok@intel.com> | 2006-04-18 12:31:04 -0700 |
|---|---|---|
| committer |   Auke Kok <juke-jan.h.kok@intel.com> | 2006-04-18 12:31:04 -0700 |
| commit | 1cb5821f444cadbe94453282f9f4767cf8744a8e (patch) | |
| tree | b23e6c848614a7ca67248eaf4e8ec9b50c092075 /drivers/net/e1000/e1000_main.c | |
| parent | e1000: fix mispatch for media type detect. (diff) | |
| download | linux-dev-1cb5821f444cadbe94453282f9f4767cf8744a8e.tar.xz linux-dev-1cb5821f444cadbe94453282f9f4767cf8744a8e.zip | |
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/e1000_main.c')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 3 |
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, 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 |