Commit 1cb5821f authored Apr 18, 2006 by Auke Kok Committed by Auke Kok Apr 18, 2006

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>

parent dc86d32a

drivers/net/e1000/e1000_main.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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