diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
| commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
| tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /drivers/net/82596.c | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/net/82596.c')
| -rw-r--r-- | drivers/net/82596.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index 640d7ca2ebcf..3ff1155459a3 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
| @@ -830,7 +830,6 @@ memory_squeeze: | |||
| 830 | lp->stats.rx_dropped++; | 830 | lp->stats.rx_dropped++; |
| 831 | } | 831 | } |
| 832 | else { | 832 | else { |
| 833 | skb->dev = dev; | ||
| 834 | if (!rx_in_place) { | 833 | if (!rx_in_place) { |
| 835 | /* 16 byte align the data fields */ | 834 | /* 16 byte align the data fields */ |
| 836 | skb_reserve(skb, 2); | 835 | skb_reserve(skb, 2); |