Skip to content

Commit

Permalink
e1000: fix mismerge skb_put.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Auke Kok authored and Auke Kok committed Apr 18, 2006
1 parent dc86d32 commit 1cb5821
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/net/e1000/e1000_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1cb5821

Please sign in to comment.