2012-08-28 13:11:36

by Wei Yongjun

[permalink] [raw]
Subject: [PATCH] rtlwifi: rtl8192de: remove pointless conditional before kfree_skb()

From: Wei Yongjun <[email protected]>

Remove pointless conditional before kfree_skb().

Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
index 895ae6c..a3aede0 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
@@ -570,8 +570,7 @@ static bool _rtl92d_cmd_send_packet(struct ieee80211_hw *hw,

ring = &rtlpci->tx_ring[BEACON_QUEUE];
pskb = __skb_dequeue(&ring->queue);
- if (pskb)
- kfree_skb(pskb);
+ kfree_skb(pskb);
spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
pdesc = &ring->desc[idx];
/* discard output from call below */




2012-08-28 14:44:37

by Larry Finger

[permalink] [raw]
Subject: Re: [PATCH] rtlwifi: rtl8192de: remove pointless conditional before kfree_skb()

On 08/28/2012 08:11 AM, Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> Remove pointless conditional before kfree_skb().
>
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)

Acked-by: Larry Finger <Larry.Finger.net>

Thanks,

Larry

>
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
> index 895ae6c..a3aede0 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192de/fw.c
> @@ -570,8 +570,7 @@ static bool _rtl92d_cmd_send_packet(struct ieee80211_hw *hw,
>
> ring = &rtlpci->tx_ring[BEACON_QUEUE];
> pskb = __skb_dequeue(&ring->queue);
> - if (pskb)
> - kfree_skb(pskb);
> + kfree_skb(pskb);
> spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
> pdesc = &ring->desc[idx];
> /* discard output from call below */
>
>
>