]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dc86d32) | patch
e1000: fix mismerge skb_put.
authorAuke Kok <auke-jan.h.kok@intel.com>
Tue, 18 Apr 2006 19:31:04 +0000 (12:31 -0700)
committerAuke Kok <juke-jan.h.kok@intel.com>
Tue, 18 Apr 2006 19:31:04 +0000 (12:31 -0700)
commit1cb5821f444cadbe94453282f9f4767cf8744a8e
treeb23e6c848614a7ca67248eaf4e8ec9b50c092075tree | snapshot
parentdc86d32ab51c4ad3086472457fb90b61249d91f5commit | 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>
drivers/net/e1000/e1000_main.c diff | blob | history
Linux 2.6 source tree