diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-06 17:16:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-06 17:16:19 -0400 |
| commit | 9aec247d3b213f3c29cfba921cf11deb1ed513cd (patch) | |
| tree | 6ce8272654896b4d0e05b1c82b8d7d3292284676 /net/netrom/nr_dev.c | |
| parent | dce32c781b1c026863a254fe8123dd78c59ad984 (diff) | |
| parent | 3a867b36c3234673e61f883ebc11ad18f80a176f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/netrom/nr_dev.c')
| -rw-r--r-- | net/netrom/nr_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c index 4e66eef9a034..509afddae569 100644 --- a/net/netrom/nr_dev.c +++ b/net/netrom/nr_dev.c | |||
| @@ -58,7 +58,7 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev) | |||
| 58 | 58 | ||
| 59 | /* Spoof incoming device */ | 59 | /* Spoof incoming device */ |
| 60 | skb->dev = dev; | 60 | skb->dev = dev; |
| 61 | skb->h.raw = skb->data; | 61 | skb->mac.raw = skb->nh.raw; |
| 62 | skb->nh.raw = skb->data; | 62 | skb->nh.raw = skb->data; |
| 63 | skb->pkt_type = PACKET_HOST; | 63 | skb->pkt_type = PACKET_HOST; |
| 64 | 64 | ||