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

Revert "net: bridge: use DEV_STATS_INC()"

Browse Source 
This reverts commit 04cc361f02 which is
commit 44bdb313da57322c9b3c108eb66981c6ec6509f4 upstream.

It breaks the build as it relies on a previous patch that was reverted
for Android ABI issues.  It can be brought back in an abi-safe way in
the future if needed.

Change-Id: Iccdf587ba58542c014d04eabfa521bc5dcbb1641
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-10-27 07:46:29 +00:00
parent 3e7bedcc0e
commit f95f372cf9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/bridge/br_forward.c
View File

@@ -118,7 +118,7 @@ static int deliver_clone(const struct net_bridge_port *prev,
skb = skb_clone(skb, GFP_ATOMIC); skb = skb_clone(skb, GFP_ATOMIC);
if (!skb) { if (!skb) {
DEV_STATS_INC(dev, tx_dropped); dev->stats.tx_dropped++;
return -ENOMEM; return -ENOMEM;
} }
@@ -255,7 +255,7 @@ static void maybe_deliver_addr(struct net_bridge_port *p, struct sk_buff *skb,
skb = skb_copy(skb, GFP_ATOMIC); skb = skb_copy(skb, GFP_ATOMIC);
if (!skb) { if (!skb) {
DEV_STATS_INC(dev, tx_dropped); dev->stats.tx_dropped++;
return; return;
} }

4
net/bridge/br_input.c
View File

@@ -145,12 +145,12 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb
if ((mdst && mdst->host_joined) || if ((mdst && mdst->host_joined) ||
br_multicast_is_router(br)) { br_multicast_is_router(br)) {
local_rcv = true; local_rcv = true;
DEV_STATS_INC(br->dev, multicast); br->dev->stats.multicast++;
} }
mcast_hit = true; mcast_hit = true;
} else { } else {
local_rcv = true; local_rcv = true;
DEV_STATS_INC(br->dev, multicast); br->dev->stats.multicast++;
} }
break; break;
case BR_PKT_UNICAST: case BR_PKT_UNICAST: