armbian/linux-rockchip
0
0
Fork 0
mirror of https://github.com/armbian/linux-rockchip.git synced 2026-01-06 11:08:10 -08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ipvlan: properly track tx_errors"

Browse Source 
This reverts commit 9954a7f380 which is
commit ff672b9ffeb3f82135488ac16c5c5eb4b992999b upstream.

It breaks the build as an ABI-breaking change was reverted before this.
if this is needed, it can be brought back in an abi-safe way, but as
Android does not use the ipvlan code, it's probably not needed.

Bug: 161946584
Change-Id: I7e053b55bea4cac028ed7d65516a886d29c0476d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-11-30 11:45:36 +00:00
committed by Matthias Männich
parent ddeac706a1
commit 53595e1cbf
2 changed files with 4 additions and 5 deletions
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

@@ -322,7 +322,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)