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/hp100.c | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/net/hp100.c')
| -rw-r--r-- | drivers/net/hp100.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c index 7dc5185aa2c0..8118a6750b61 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c | |||
| @@ -1816,7 +1816,6 @@ static void hp100_rx(struct net_device *dev) | |||
| 1816 | u_char *ptr; | 1816 | u_char *ptr; |
| 1817 | 1817 | ||
| 1818 | skb_reserve(skb,2); | 1818 | skb_reserve(skb,2); |
| 1819 | skb->dev = dev; | ||
| 1820 | 1819 | ||
| 1821 | /* ptr to start of the sk_buff data area */ | 1820 | /* ptr to start of the sk_buff data area */ |
| 1822 | skb_put(skb, pkt_len); | 1821 | skb_put(skb, pkt_len); |