提交 1d2f8c95 编写于 作者: W Wei Yongjun 提交者: David S. Miller

ppp: remove some pointless conditionals before kfree_skb()

Remove some pointless conditionals before kfree_skb().
Signed-off-by: NWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 875b4829
...@@ -233,11 +233,9 @@ ppp_asynctty_close(struct tty_struct *tty) ...@@ -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);
} }
......
...@@ -1245,8 +1245,7 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb) ...@@ -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) ...@@ -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);
} }
......
...@@ -281,8 +281,7 @@ ppp_sync_close(struct tty_struct *tty) ...@@ -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);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册