summaryrefslogtreecommitdiff
path: root/net/netrom/nr_dev.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-08 03:31:22 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-08 03:31:22 -0400
commitd95300758bed9e0f783f3e3b4fd037bf0a21abe0 (patch)
tree994823b6e0b88597eded79f9eeb0f44b580c89e5 /net/netrom/nr_dev.c
parente12669e774be403c84baa651306d305752a35cd8 (diff)
parent829841146878e082613a49581ae252c071057c23 (diff)
downloadlinux-d95300758bed9e0f783f3e3b4fd037bf0a21abe0.tar.gz
Merge branch 'master'
Diffstat (limited to 'net/netrom/nr_dev.c')
-rw-r--r--net/netrom/nr_dev.c2
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)
/* Spoof incoming device */
skb->dev = dev;
- skb->h.raw = skb->data;
+ skb->mac.raw = skb->nh.raw;
skb->nh.raw = skb->data;
skb->pkt_type = PACKET_HOST;