patch-2.1.86 linux/drivers/isdn/isdn_net.c

Next file: linux/drivers/isdn/isdn_ppp.c
Previous file: linux/drivers/isdn/isdn_common.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.85/linux/drivers/isdn/isdn_net.c linux/drivers/isdn/isdn_net.c
@@ -303,11 +303,11 @@
 	save_flags(flags);
 	cli();
 	if (lp->first_skb) {
-		dev_kfree_skb(lp->first_skb, FREE_WRITE);
+		dev_kfree_skb(lp->first_skb);
 		lp->first_skb = NULL;
 	}
 	if (lp->sav_skb) {
-		dev_kfree_skb(lp->sav_skb, FREE_WRITE);
+		dev_kfree_skb(lp->sav_skb);
 		lp->sav_skb = NULL;
 	}
 #ifdef DEV_NUMBUFFS
@@ -452,11 +452,11 @@
 				if ((!lp->dialstate) && (lp->flags & ISDN_NET_CONNECTED)) {
 					lp->flags &= ~ISDN_NET_CONNECTED;
 					if (lp->first_skb) {
-						dev_kfree_skb(lp->first_skb, FREE_WRITE);
+						dev_kfree_skb(lp->first_skb);
 						lp->first_skb = NULL;
 					}
 					if (lp->sav_skb) {
-						dev_kfree_skb(lp->sav_skb, FREE_WRITE);
+						dev_kfree_skb(lp->sav_skb);
 						lp->sav_skb = NULL;
 					}
 					isdn_free_channel(lp->isdn_device, lp->isdn_channel,
@@ -912,7 +912,7 @@
 	}
 	if (ret < 0) {
 		SET_SKB_FREE(skb);
-		dev_kfree_skb(skb, FREE_WRITE);
+		dev_kfree_skb(skb);
 		lp->stats.tx_errors++;
 		clear_bit(0, (void *) &(ndev->tbusy));
 		return 0;
@@ -1043,7 +1043,7 @@
 #else
 					isdn_net_unreachable(ndev, skb,
 							   "No channel");
-					dev_kfree_skb(skb, FREE_WRITE);
+					dev_kfree_skb(skb);
 					ndev->tbusy = 0;
 					return 0;
 #endif
@@ -1059,7 +1059,7 @@
 				if (lp->p_encap == ISDN_NET_ENCAP_SYNCPPP) {
 					/* no 'first_skb' handling for syncPPP */
 					if (isdn_ppp_bind(lp) < 0) {
-						dev_kfree_skb(skb, FREE_WRITE);
+						dev_kfree_skb(skb);
 						isdn_net_unbind_channel(lp);
 						restore_flags(flags);
 						return 0;	/* STN (skb to nirvana) ;) */
@@ -1074,7 +1074,7 @@
 				 */
 				if (lp->first_skb) {
 					printk(KERN_WARNING "isdn_net_start_xmit: First skb already set!\n");
-					dev_kfree_skb(lp->first_skb, FREE_WRITE);
+					dev_kfree_skb(lp->first_skb);
 					lp->first_skb = NULL;
 				}
 				lp->first_skb = skb;
@@ -1086,7 +1086,7 @@
 			} else {
 				isdn_net_unreachable(ndev, skb,
 						     "No phone number");
-				dev_kfree_skb(skb, FREE_WRITE);
+				dev_kfree_skb(skb);
 				ndev->tbusy = 0;
 				return 0;
 			}
@@ -1272,7 +1272,7 @@
 		default:
 			printk(KERN_WARNING "%s: unknown encapsulation, dropping\n",
 			       lp->name);
-			kfree_skb(skb, FREE_READ);
+			kfree_skb(skb);
 			return;
 	}
 	netif_rx(skb);
@@ -2610,7 +2610,7 @@
 	for (i = 0; i < DEV_NUMBUFFS; i++) {
 		struct sk_buff *skb;
 		while ((skb = skb_dequeue(&dev->buffs[i])))
-			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