X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=net%2Fax25%2Fax25_in.c;h=e9d94291581ea1a67d53f39989ed26aef5fd0320;hb=6b48a7d08d1bb2e3932bce1662fe411304acc18f;hp=73cfc3411c461d50d7dbb7d718dd3e2315d26428;hpb=9472d8ce147fecb80a2f29ad8ab781e596858916;p=powerpc.git

diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c
index 73cfc3411c..e9d9429158 100644
--- a/net/ax25/ax25_in.c
+++ b/net/ax25/ax25_in.c
@@ -102,8 +102,8 @@ static int ax25_rx_fragment(ax25_cb *ax25, struct sk_buff *skb)
 int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb)
 {
 	int (*func)(struct sk_buff *, ax25_cb *);
-	volatile int queued = 0;
 	unsigned char pid;
+	int queued = 0;
 
 	if (skb == NULL) return 0;
 
@@ -401,10 +401,8 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev,
 	}
 
 	if (dp.ndigi == 0) {
-		if (ax25->digipeat != NULL) {
-			kfree(ax25->digipeat);
-			ax25->digipeat = NULL;
-		}
+		kfree(ax25->digipeat);
+		ax25->digipeat = NULL;
 	} else {
 		/* Reverse the source SABM's path */
 		memcpy(ax25->digipeat, &reverse_dp, sizeof(ax25_digi));