xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: Fix up ipvlan merge in 5.10.202

Browse Source 
In commit 43b781e7cb ("ipvlan: add ipvlan_route_v6_outbound()
helper"), DEV_STATS_INC() is used, but that's not a valid api in the
5.10.y Android tree due to it breaking the abi.  So fix this up by hand
to use the "old-style" stats increment call to resolve the build issues.

Fixes: 43b781e7cb ("ipvlan: add ipvlan_route_v6_outbound() helper")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id7bdb1b5f742ae32b7f9e8f6db808c5763a8394c
This commit is contained in:
Greg Kroah-Hartman
2023-12-11 12:17:03 +00:00
parent f6509591ff
commit 76b525ba59
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -488,7 +488,7 @@ static int ipvlan_process_v6_outbound(struct sk_buff *skb)
err = ipvlan_route_v6_outbound(dev, skb); err = ipvlan_route_v6_outbound(dev, skb);
if (unlikely(err)) { if (unlikely(err)) {
DEV_STATS_INC(dev, tx_errors); dev->stats.tx_errors++;
kfree_skb(skb); kfree_skb(skb);
return err; return err;
} }
@@ -497,7 +497,7 @@ static int ipvlan_process_v6_outbound(struct sk_buff *skb)
err = ip6_local_out(dev_net(dev), skb->sk, skb); err = ip6_local_out(dev_net(dev), skb->sk, skb);
if (unlikely(net_xmit_eval(err))) if (unlikely(net_xmit_eval(err)))
DEV_STATS_INC(dev, tx_errors); dev->stats.tx_errors++;
else else
ret = NET_XMIT_SUCCESS; ret = NET_XMIT_SUCCESS;
return ret; return ret;