iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ppp: remove some pointless conditionals before kfree_skb()

Browse Source 
Remove some pointless conditionals before kfree_skb().

Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Wei Yongjun 2009-02-25 00:16:08 +00:00 committed by David S. Miller
parent 875b48297b
commit 1d2f8c9507
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ppp_async.c
View File

@ -233,11 +233,9 @@ ppp_asynctty_close(struct tty_struct *tty)
tasklet_kill(&ap->tsk); tasklet_kill(&ap->tsk);
ppp_unregister_channel(&ap->chan); ppp_unregister_channel(&ap->chan);
if (ap->rpkt) kfree_skb(ap->rpkt);
kfree_skb(ap->rpkt);
skb_queue_purge(&ap->rqueue); skb_queue_purge(&ap->rqueue);
if (ap->tpkt) kfree_skb(ap->tpkt);
kfree_skb(ap->tpkt);
kfree(ap); kfree(ap);
} }

6
drivers/net/ppp_generic.c
View File

@ -1245,8 +1245,7 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb)
return; return;
drop: drop:
if (skb) kfree_skb(skb);
kfree_skb(skb);
++ppp->dev->stats.tx_errors; ++ppp->dev->stats.tx_errors;
} }
@ -2658,8 +2657,7 @@ static void ppp_destroy_interface(struct ppp *ppp)
ppp->active_filter = NULL; ppp->active_filter = NULL;
#endif /* CONFIG_PPP_FILTER */ #endif /* CONFIG_PPP_FILTER */
if (ppp->xmit_pending) kfree_skb(ppp->xmit_pending);
kfree_skb(ppp->xmit_pending);
free_netdev(ppp->dev); free_netdev(ppp->dev);
} }

3
drivers/net/ppp_synctty.c
View File

@ -281,8 +281,7 @@ ppp_sync_close(struct tty_struct *tty)
ppp_unregister_channel(&ap->chan); ppp_unregister_channel(&ap->chan);
skb_queue_purge(&ap->rqueue); skb_queue_purge(&ap->rqueue);
if (ap->tpkt) kfree_skb(ap->tpkt);
kfree_skb(ap->tpkt);
kfree(ap); kfree(ap);
} }