Skip to contentSkip to conversation

staging: remove some pointless conditionals before kfree_skb()

PATCH Applied Wei Yongjun 3 participants 3 messages Feb 25, 2009 – Mar 11, 2009 Staging

lore
Share & tools
lore
#0 lore raw

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

Remove some pointless conditionals before kfree_skb().

---
 drivers/staging/at76_usb/at76_usb.c |    3 +--
 drivers/staging/otus/wwrap.c        |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/staging/at76_usb/at76_usb.c +1 -2
index c8e4d31..6f5c1cb 100644
@@ -5370,8 +5370,7 @@ static void at76_delete_device(struct at76_priv *priv)
 
 	at76_dbg(DBG_PROC_ENTRY, "%s: unlinked urbs", __func__);
 
-	if (priv->rx_skb)
-		kfree_skb(priv->rx_skb);
+	kfree_skb(priv->rx_skb);
 
 	at76_free_bss_list(priv);
 	del_timer_sync(&priv->bss_list_timer);
drivers/staging/otus/wwrap.c +1 -2
index 1bb5f59..a0b1e0b 100644
@@ -971,8 +971,7 @@ int zfLnxCencSendMsg(struct sock *netlink_sk, u_int8_t *msg, int len)
 out:
 	return ret;
 nlmsg_failure: /*NLMSG_PUT 失败,则撤销套接字缓存*/
-  	if(skb)
-    		kfree_skb(skb);
+	kfree_skb(skb);
 	goto out;
 
 #undef COMMTYPE_GROUP
Signature · 1 line
1.5.3.8
#2 lore raw

patch staging-remove-some-pointless-conditionals-before-kfree_skb.patch added to gregkh-2.6 tree

In reply to Wei Yongjun

This is a note to let you know that I've just added the patch titled

Subject: Staging: remove some pointless conditionals before kfree_skb()

to my gregkh-2.6 tree. Its filename is

staging-remove-some-pointless-conditionals-before-kfree_skb.patch

This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/

Quoted 1 line

From [email protected] Wed Mar 11 13:27:24 2009

From: Wei Yongjun <[email protected]>
Date: Wed, 25 Feb 2009 18:26:33 +0800
Subject: Staging: remove some pointless conditionals before kfree_skb()
To: Greg Kroah-Hartman <[email protected]>, LKML <[email protected]>
Message-ID: <[email protected]>

Remove some pointless conditionals before kfree_skb().

---
 drivers/staging/at76_usb/at76_usb.c |    3 +--
 drivers/staging/otus/wwrap.c        |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/staging/at76_usb/at76_usb.c +1 -2
@@ -5370,8 +5370,7 @@ static void at76_delete_device(struct at
 
 	at76_dbg(DBG_PROC_ENTRY, "%s: unlinked urbs", __func__);
 
-	if (priv->rx_skb)
-		kfree_skb(priv->rx_skb);
+	kfree_skb(priv->rx_skb);
 
 	at76_free_bss_list(priv);
 	del_timer_sync(&priv->bss_list_timer);
drivers/staging/otus/wwrap.c +1 -2
@@ -971,8 +971,7 @@ int zfLnxCencSendMsg(struct sock *netlin
 out:
 	return ret;
 nlmsg_failure: /*NLMSG_PUT ʧ�ܣ������׽��ֻ���*/
-  	if(skb)
-    		kfree_skb(skb);
+	kfree_skb(skb);
 	goto out;
 
 #undef COMMTYPE_GROUP