Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b368741 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "net: bridge: use DEV_STATS_INC()" 



This reverts commit d2346e6b which is
commit 44bdb313da57322c9b3c108eb66981c6ec6509f4 upstream.

It is needed to be reverted as it relies on an abi-breaking change that
also must be reverted.  It's not really needed for Android systems, but
if it is needed to come back, it can be reworked to be a CRC-abi neutral
change if so desired.

Bug: 161946584
Change-Id: I8a9f35972d5ade06a3bafd6a965ac2430ad0e63d
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 7f2e8107

net/bridge/br_forward.c

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,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;

	}
@@ -261,7 +261,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;

	}

net/bridge/br_input.c

+2 −2
Original line number Diff line number Diff line
@@ -146,12 +146,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: