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

Commit a4cd0271 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

net: revert "net: l2tp: Treat NET_XMIT_CN as success in l2tp_eth_dev_xmit" 



This reverts commit 7c6ae610, because l2tp_xmit_skb() never
returns NET_XMIT_CN, it ignores the return value of l2tp_xmit_core().

Cc: Gao Feng <gfree.wind@gmail.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 93af2056

net/l2tp/l2tp_eth.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev) 
	unsigned int len = skb->len;

	unsigned int len = skb->len;

	int ret = l2tp_xmit_skb(session, skb, session->hdr_len);

	int ret = l2tp_xmit_skb(session, skb, session->hdr_len);





	if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN)) {

	if (likely(ret == NET_XMIT_SUCCESS)) {

		atomic_long_add(len, &priv->tx_bytes);

		atomic_long_add(len, &priv->tx_bytes);

		atomic_long_inc(&priv->tx_packets);

		atomic_long_inc(&priv->tx_packets);

	} else {

	} else {