patch-2.1.16 linux/net/ax25/ax25_subr.c

Next file: linux/net/bridge/br.c
Previous file: linux/net/ax25/ax25_out.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.15/linux/net/ax25/ax25_subr.c linux/net/ax25/ax25_subr.c
@@ -64,21 +64,17 @@
 {
 	struct sk_buff *skb;
 
-	while ((skb = skb_dequeue(&ax25->write_queue)) != NULL) {
+	while ((skb = skb_dequeue(&ax25->write_queue)) != NULL)
 		kfree_skb(skb, FREE_WRITE);
-	}
 
-	while ((skb = skb_dequeue(&ax25->ack_queue)) != NULL) {
+	while ((skb = skb_dequeue(&ax25->ack_queue)) != NULL)
 		kfree_skb(skb, FREE_WRITE);
-	}
 
-	while ((skb = skb_dequeue(&ax25->reseq_queue)) != NULL) {
+	while ((skb = skb_dequeue(&ax25->reseq_queue)) != NULL)
 		kfree_skb(skb, FREE_READ);
-	}
 
-	while ((skb = skb_dequeue(&ax25->frag_queue)) != NULL) {
+	while ((skb = skb_dequeue(&ax25->frag_queue)) != NULL)
 		kfree_skb(skb, FREE_READ);
-	}
 }
 
 /*
@@ -271,8 +267,8 @@
 	dptr  = skb_push(skb, size_ax25_addr(digi));
 	dptr += build_ax25_addr(dptr, dest, src, &retdigi, C_RESPONSE, MODULUS);
 
-	skb->arp  = 1;
-	skb->dev = dev;
+	skb->arp      = 1;
+	skb->dev      = dev;
 	skb->priority = SOPRI_NORMAL;
 
 	ax25_queue_xmit(skb);
@@ -534,11 +530,12 @@
 
 	p = skb_put(skb, 2);
 
-	*p++=cmd;
-	*p  =param;
+	*p++ = cmd;
+	*p++ = param;
+
+	skb->dev      = ax25->device;
+	skb->priority = SOPRI_NORMAL;
 
-	skb->dev=ax25->device;
-	skb->priority=SOPRI_NORMAL;
 	dev_queue_xmit(skb);
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov