lisa/android_kernel_xiaomi_sm8350
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 ad8d39c7b4 which is
commit 44bdb313da57322c9b3c108eb66981c6ec6509f4 upstream.

It breaks the build as the change that it relies on was reverted due to
Android ABI breakage.  If it is needed in the future, it can be brought
back in an abi-safe way.

Bug: 161946584
Change-Id: I692ca5528a7d9d09122b6aeaf0751c45befa5dda
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-10-12 11:46:19 +00:00
parent f69adcec03
commit c5c964fd2f
2 changed files with 4 additions and 4 deletions
Show Stats 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);
if (!skb) {
DEV_STATS_INC(dev, tx_dropped);
dev->stats.tx_dropped++;
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);
if (!skb) {
DEV_STATS_INC(dev, tx_dropped);
dev->stats.tx_dropped++;
return;
}

4
net/bridge/br_input.c
View File

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