diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 14:16:19 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 14:16:19 -0400 |
| commit | d1da4e50e5d09f02c340927a4fcb7f54202fa033 (patch) | |
| tree | 7f98317bdd45dbdb7644e9179891c5af6a3a8ef1 /drivers/net/82596.c | |
| parent | 78ab67da1002d954ea4c3e2b441e2483c41f94e8 (diff) | |
| parent | a205752d1ad2d37d6597aaae5a56fc396a770868 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/Kconfig
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
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); |