From 9c86325e8992fcb89d6451683e13468f72372aeb Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 20 Dec 2007 00:25:54 -0800 Subject: [PATCH] --- yaml --- r: 75132 b: refs/heads/master c: c6e6ca712b5cc06a662f900c0484d49d7334af64 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 ef0d6ae218e8..2c2a2313a6c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d0691674764098304ae4c63c715f5883b4d3784 +refs/heads/master: c6e6ca712b5cc06a662f900c0484d49d7334af64 diff --git a/trunk/net/ax25/ax25_in.c b/trunk/net/ax25/ax25_in.c index 3b7d1720c2ee..d1be080dcb25 100644 --- a/trunk/net/ax25/ax25_in.c +++ b/trunk/net/ax25/ax25_in.c @@ -124,7 +124,7 @@ int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb) } skb_pull(skb, 1); /* Remove PID */ - skb_reset_mac_header(skb); + skb->mac_header = skb->network_header; skb_reset_network_header(skb); 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 8c68da5ef0a1..6caf459665f2 100644 --- a/trunk/net/netrom/nr_dev.c +++ b/trunk/net/netrom/nr_dev.c @@ -56,7 +56,7 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev) /* Spoof incoming device */ skb->dev = dev; - skb_reset_mac_header(skb); + skb->mac_header = skb->network_header; skb_reset_network_header(skb); skb->pkt_type = PACKET_HOST;