---

yaml --- r: 75132 b: refs/heads/master c: c6e6ca7 h: refs/heads/master v: v3
git-mirror · Dec 20, 2007 · 9c86325 · 9c86325
1 parent 4fc2808
commit 9c86325
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;