From 202790e2f1a5142e268d89902006b3c6d2f7bebd Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Oct 2005 12:16:04 -0700 Subject: [PATCH] --- yaml --- r: 9674 b: refs/heads/master c: 3a867b36c3234673e61f883ebc11ad18f80a176f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ax25/ax25_in.c | 2 +- trunk/net/netrom/nr_dev.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3c016f725cfe..cfa518c34c44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77d8d7a6848c81084f413e1ec4982123a56e2ccb +refs/heads/master: 3a867b36c3234673e61f883ebc11ad18f80a176f diff --git a/trunk/net/ax25/ax25_in.c b/trunk/net/ax25/ax25_in.c index 810c9c76c2e0..73cfc3411c46 100644 --- a/trunk/net/ax25/ax25_in.c +++ b/trunk/net/ax25/ax25_in.c @@ -123,7 +123,7 @@ int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb) } skb_pull(skb, 1); /* Remove PID */ - skb->h.raw = skb->data; + skb->mac.raw = skb->nh.raw; skb->nh.raw = skb->data; skb->dev = ax25->ax25_dev->dev; skb->pkt_type = PACKET_HOST; diff --git a/trunk/net/netrom/nr_dev.c b/trunk/net/netrom/nr_dev.c index 4e66eef9a034..509afddae569 100644 --- a/trunk/net/netrom/nr_dev.c +++ b/trunk/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;