]> err.no Git - linux-2.6/commitdiff
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)
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

index 2b8bced0cf64f7f95f50e860ad9d9d38a5d70683..fb8cef6191422868eba824a51b8768676b475b48 100644 (file)
@@ -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