patch-2.1.86 linux/drivers/net/x25_asy.c

Next file: linux/drivers/net/znet.c
Previous file: linux/drivers/net/wavelan.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.85/linux/drivers/net/x25_asy.c linux/drivers/net/x25_asy.c
@@ -244,7 +244,7 @@
 	skb->protocol=htons(ETH_P_X25);
 	if((err=lapb_data_received(sl,skb))!=LAPB_OK)
 	{
-		kfree_skb(skb, FREE_READ);
+		kfree_skb(skb);
 		printk(KERN_DEBUG "x25_asy: data received err - %d\n",err);
 	}
 	else
@@ -342,13 +342,13 @@
 		case 0x01: /* Connection request .. do nothing */
 			if((err=lapb_connect_request(sl))!=LAPB_OK)
 				printk(KERN_ERR "x25_asy: lapb_connect_request error - %d\n", err);
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			return 0;
 		case 0x02: /* Disconnect request .. do nothing - hang up ?? */
 			if((err=lapb_disconnect_request(sl))!=LAPB_OK)
 				printk(KERN_ERR "x25_asy: lapb_disconnect_request error - %d\n", err);
 		default:
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 			return  0;
 	}
 	skb_pull(skb,1);	/* Remove control byte */
@@ -385,7 +385,7 @@
 	if((err=lapb_data_request(sl,skb))!=LAPB_OK)
 	{
 		printk(KERN_ERR "lapbeth: lapb_data_request error - %d\n", err);
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 		return 0;
 	}
 	return 0;
@@ -418,7 +418,7 @@
 	if(sl->dev->tbusy)
 	{
 		printk(KERN_ERR "x25_asy: tbusy drop\n");
-		kfree_skb(skb, FREE_WRITE);
+		kfree_skb(skb);
 		return;
 	}
 	/* We were not busy, so we are now... :-) */
@@ -427,7 +427,7 @@
 		x25_asy_lock(sl);
 		sl->tx_bytes+=skb->len;
 		x25_asy_encaps(sl, skb->data, skb->len);
-		dev_kfree_skb(skb, FREE_WRITE);
+		dev_kfree_skb(skb);
 	}
 }
 

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