Skip to contentSkip to conversation

ppp: remove some pointless conditionals before kfree_skb()

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

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

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

Remove some pointless conditionals before kfree_skb().

---
 drivers/net/ppp_async.c   |    6 ++----
 drivers/net/ppp_generic.c |    6 ++----
 drivers/net/ppp_synctty.c |    3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)
drivers/net/ppp_async.c +2 -4
index 6567fab..5de6fed 100644
@@ -233,11 +233,9 @@ ppp_asynctty_close(struct tty_struct *tty)
 	tasklet_kill(&ap->tsk);
 
 	ppp_unregister_channel(&ap->chan);
-	if (ap->rpkt)
-		kfree_skb(ap->rpkt);
+	kfree_skb(ap->rpkt);
 	skb_queue_purge(&ap->rqueue);
-	if (ap->tpkt)
-		kfree_skb(ap->tpkt);
+	kfree_skb(ap->tpkt);
 	kfree(ap);
 }
 
drivers/net/ppp_generic.c +2 -4
index 81e7fcc..4a12159 100644
@@ -1245,8 +1245,7 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
 	return;
 
  drop:
-	if (skb)
-		kfree_skb(skb);
+	kfree_skb(skb);
 	++ppp->dev->stats.tx_errors;
 }
 
@@ -2658,8 +2657,7 @@ static void ppp_destroy_interface(struct ppp *ppp)
 	ppp->active_filter = NULL;
 #endif /* CONFIG_PPP_FILTER */
 
-	if (ppp->xmit_pending)
-		kfree_skb(ppp->xmit_pending);
+	kfree_skb(ppp->xmit_pending);
 
 	free_netdev(ppp->dev);
 }
drivers/net/ppp_synctty.c +1 -2
index 1e892b7..3ea791d 100644
@@ -281,8 +281,7 @@ ppp_sync_close(struct tty_struct *tty)
 
 	ppp_unregister_channel(&ap->chan);
 	skb_queue_purge(&ap->rqueue);
-	if (ap->tpkt)
-		kfree_skb(ap->tpkt);
+	kfree_skb(ap->tpkt);
 	kfree(ap);
 }
 
Signature · 1 line
1.5.3.8