X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2Fax25%2Fax25_in.c;h=33790a8efbc89ad1b02f3e39f99fbb2a48cc6ff6;hb=0c4c8cae44e9d71afd3031c1e8739bd398a831a8;hp=3b7d1720c2eee2c3d652526f74f92094bb4634b4;hpb=dcf397f037f52add9945eced57ca300ab6a4413c;p=~andy%2Flinux

diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c
index 3b7d1720c2e..33790a8efbc 100644
--- a/net/ax25/ax25_in.c
+++ b/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;
@@ -451,7 +451,7 @@ int ax25_kiss_rcv(struct sk_buff *skb, struct net_device *dev,
 	skb->sk = NULL;		/* Initially we don't know who it's for */
 	skb->destructor = NULL;	/* Who initializes this, dammit?! */
 
-	if (dev->nd_net != &init_net) {
+	if (dev_net(dev) != &init_net) {
 		kfree_skb(skb);
 		return 0;
 	}