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

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

diff -u --recursive --new-file v2.1.85/linux/drivers/isdn/isdn_common.c linux/drivers/isdn/isdn_common.c
@@ -277,7 +277,7 @@
 	cli();
 	if (skb_queue_len(queue))
 		while ((skb = skb_dequeue(queue)))
-			isdn_trash_skb(skb, FREE_READ);
+			isdn_trash_skb(skb);
 	restore_flags(flags);
 }
 
@@ -374,7 +374,7 @@
 	int i;
 
 	if ((i = isdn_dc2minor(di, channel)) == -1) {
-		isdn_trash_skb(skb, FREE_READ);
+		isdn_trash_skb(skb);
 		return;
 	}
 	/* Update statistics */
@@ -389,7 +389,7 @@
 			return;
 		wake_up_interruptible(&dev->drv[di]->rcv_waitq[channel]);
 	} else
-		isdn_trash_skb(skb, FREE_READ);
+		isdn_trash_skb(skb);
 }
 
 void
@@ -752,7 +752,7 @@
 			ISDN_AUDIO_SKB_LOCK(skb) = 0;
 #endif
 			skb = skb_dequeue(&dev->drv[di]->rpqueue[channel]);
-			isdn_trash_skb(skb, FREE_READ);
+			isdn_trash_skb(skb);
 		} else {
 			/* Not yet emptied this buff, so it
 			 * must stay in the queue, for further calls
@@ -1892,7 +1892,7 @@
 		ret = dev->drv[drvidx]->interface->writebuf_skb(drvidx,
 							      chan, skb);
 		if (ret <= 0)
-			kfree_skb(skb, FREE_WRITE);
+			kfree_skb(skb);
 	}
 	if (ret > 0)
 		dev->obytes[isdn_dc2minor(drvidx, chan)] += ret;
@@ -1919,7 +1919,7 @@
 	else {
 		if ((ret = dev->drv[drvidx]->interface->
 		  writebuf(drvidx, chan, skb->data, skb->len, 0)) == len)
-			dev_kfree_skb(skb, FREE_WRITE);
+			dev_kfree_skb(skb);
 	}
 	if (ret > 0)
 		dev->obytes[isdn_dc2minor(drvidx, chan)] += len;

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