Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d2f8c95 authored by Wei Yongjun's avatar Wei Yongjun Committed by David S. Miller
Browse files

ppp: remove some pointless conditionals before kfree_skb() 



Remove some pointless conditionals before kfree_skb().

Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 875b4829

drivers/net/ppp_async.c

+2 −4
Original line number Diff line number Diff line
@@ -233,10 +233,8 @@ ppp_asynctty_close(struct tty_struct *tty) 
	tasklet_kill(&ap->tsk);



	ppp_unregister_channel(&ap->chan);

	if (ap->rpkt)

	kfree_skb(ap->rpkt);

	skb_queue_purge(&ap->rqueue);

	if (ap->tpkt)

	kfree_skb(ap->tpkt);

	kfree(ap);

}

drivers/net/ppp_generic.c

+2 −4
Original line number Diff line number Diff line
@@ -1245,7 +1245,6 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb) 
	return;



 drop:

	if (skb)

	kfree_skb(skb);

	++ppp->dev->stats.tx_errors;

}
@@ -2658,7 +2657,6 @@ 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);



	free_netdev(ppp->dev);

drivers/net/ppp_synctty.c

+1 −2
Original line number Diff line number Diff line
@@ -281,7 +281,6 @@ 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(ap);

}