diff options
| author |   WANG Cong <xiyou.wangcong@gmail.com> | 2016-11-21 23:24:43 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-11-23 20:18:36 -0500 |
| commit | a4cd0271ead09439fa03ce38fa79654dd1e5484b (patch) | |
| tree | af406ecded28c5c9fc336cbaa5ff3e560730f147 /net/l2tp/l2tp_eth.c | |
| parent | rtnetlink: fix the wrong minimal dump size getting from rtnl_calcit() (diff) | |
| download | linux-dev-a4cd0271ead09439fa03ce38fa79654dd1e5484b.tar.xz linux-dev-a4cd0271ead09439fa03ce38fa79654dd1e5484b.zip | |
net: revert "net: l2tp: Treat NET_XMIT_CN as success in l2tp_eth_dev_xmit"
This reverts commit 7c6ae610a1f0, 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: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/l2tp/l2tp_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c index 3dc97b4f982b..965f7e344cef 100644 --- a/net/l2tp/l2tp_eth.c +++ b/net/l2tp/l2tp_eth.c @@ -97,7 +97,7 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev) unsigned int len = skb->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_inc(&priv->tx_packets); } else { |