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/seeq8005.c | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/net/seeq8005.c')
| -rw-r--r-- | drivers/net/seeq8005.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c index 0d6c95c7aedf..4bce7c4f373c 100644 --- a/drivers/net/seeq8005.c +++ b/drivers/net/seeq8005.c | |||
| @@ -550,7 +550,6 @@ static void seeq8005_rx(struct net_device *dev) | |||
| 550 | lp->stats.rx_dropped++; | 550 | lp->stats.rx_dropped++; |
| 551 | break; | 551 | break; |
| 552 | } | 552 | } |
| 553 | skb->dev = dev; | ||
| 554 | skb_reserve(skb, 2); /* align data on 16 byte */ | 553 | skb_reserve(skb, 2); /* align data on 16 byte */ |
| 555 | buf = skb_put(skb,pkt_len); | 554 | buf = skb_put(skb,pkt_len); |
| 556 | 555 | ||