From: Auke Kok <auke-jan.h.kok@intel.com>
Date: Tue, 18 Apr 2006 19:31:04 +0000 (-0700)
Subject: e1000: fix mismerge skb_put.
X-Git-Tag: v2.6.18-rc1~1115^2~97^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cb5821f444cadbe94453282f9f4767cf8744a8e;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed