diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-27 07:42:21 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-27 07:42:21 +0300 |
| commit | 0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe (patch) | |
| tree | 77856ad061e97e86027df1fa6efdf20a9fe309b5 /net/l2tp | |
| parent | e5f12b3f5ebb8a6ffd3864a04f687ea0ef78a48a (diff) | |
| parent | d8e435f3ab6fea2ea324dce72b51dd7761747523 (diff) | |
| download | linux-0b42f25d2f123bb7fbd3565d003a8ea9e1e810fe.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.
Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
| -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 5b90eb6c82c4..e2c6ae024565 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 { |