Skip to contentSkip to conversation

isdn: remove some pointless conditionals before kfree_skb()

PATCH Applied Wei Yongjun 2 participants 2 messages Feb 25, 2009 – Feb 27, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 isdn: remove some pointless conditionals before kfree_skb()

Remove some pointless conditionals before kfree_skb().

---
 drivers/isdn/capi/capi.c    |    2 +-
 drivers/isdn/pcbit/layer2.c |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)
drivers/isdn/capi/capi.c +1 -1
index 1b5bf87..3e468d2 100644
@@ -277,7 +277,7 @@ static void capiminor_free(struct capiminor *mp)
 	list_del(&mp->list);
 	write_unlock_irqrestore(&capiminor_list_lock, flags);
 
-	if (mp->ttyskb) kfree_skb(mp->ttyskb);
+	kfree_skb(mp->ttyskb);
 	mp->ttyskb = NULL;
 	skb_queue_purge(&mp->inqueue);
 	skb_queue_purge(&mp->outqueue);
drivers/isdn/pcbit/layer2.c +2 -4
index 5ba2a87..e075e8d 100644
@@ -347,8 +347,7 @@ pcbit_receive(struct pcbit_dev *dev)
 		if (dev->read_frame) {
 			printk(KERN_DEBUG "pcbit_receive: Type 0 frame and read_frame != NULL\n");
 			/* discard previous queued frame */
-			if (dev->read_frame->skb)
-				kfree_skb(dev->read_frame->skb);
+			kfree_skb(dev->read_frame->skb);
 			kfree(dev->read_frame);
 			dev->read_frame = NULL;
 		}
@@ -601,8 +600,7 @@ pcbit_l2_err_recover(unsigned long data)
 	dev->w_busy = dev->r_busy = 1;
 
 	if (dev->read_frame) {
-		if (dev->read_frame->skb)
-			kfree_skb(dev->read_frame->skb);
+		kfree_skb(dev->read_frame->skb);
 		kfree(dev->read_frame);
 		dev->read_frame = NULL;
 	}
Signature · 1 line
1.5.3.8