lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ipvlan: properly track tx_errors"

Browse Source 
This reverts commit af50165c12 which is
commit ff672b9ffeb3f82135488ac16c5c5eb4b992999b upstream.

It breaks the ABI, so it must be removed at this point in time.  If it
is needed in the future, it can be brought back in an abi-safe way.

Bug: 161946584
Change-Id: Ide21bf33d413133a412f9455a7000acc1e22a148
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-11-27 15:05:05 +00:00
parent 0e07b7bd3c
commit 8d8014e4a1
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ipvlan/ipvlan_core.c
View File

@ -442,12 +442,12 @@ static int ipvlan_process_v4_outbound(struct sk_buff *skb)
err = ip_local_out(net, skb->sk, skb);
if (unlikely(net_xmit_eval(err)))
DEV_STATS_INC(dev, tx_errors);
dev->stats.tx_errors++;
else
ret = NET_XMIT_SUCCESS;
goto out;
err:
DEV_STATS_INC(dev, tx_errors);
dev->stats.tx_errors++;
kfree_skb(skb);
out:
return ret;
@ -483,12 +483,12 @@ static int ipvlan_process_v6_outbound(struct sk_buff *skb)
err = ip6_local_out(net, skb->sk, skb);
if (unlikely(net_xmit_eval(err)))
DEV_STATS_INC(dev, tx_errors);
dev->stats.tx_errors++;
else
ret = NET_XMIT_SUCCESS;
goto out;
err:
DEV_STATS_INC(dev, tx_errors);
dev->stats.tx_errors++;
kfree_skb(skb);
out:
return ret;

1
drivers/net/ipvlan/ipvlan_main.c
View File

@ -320,7 +320,6 @@ static void ipvlan_get_stats64(struct net_device *dev,
s->rx_dropped = rx_errs;
s->tx_dropped = tx_drps;
}
s->tx_errors = DEV_STATS_READ(dev, tx_errors);
}
static int ipvlan_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid)