diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 09:44:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 09:44:07 -0400 |
| commit | f58f8be7f65312f602f7970e7da47a6413e692b0 (patch) | |
| tree | f60cc040deebceea1b44082dc713e95687d8527f /net/netrom/nr_dev.c | |
| parent | c71c18576d0d8aa4db876c737c3c597c724cf02f (diff) | |
| parent | e710245bb0f980adfb1dfe850e43761a8117c6be (diff) | |
Merge branch 'upstream'
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 | ||