Commit 847d44ef authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by David S. Miller
Browse files

net: bridge: update multicast stats from maybe_deliver() 



Simplify this code by updating bridge multicast stats from
maybe_deliver().

Note that commit 6db6f0ea ("bridge: multicast to unicast"), in case
the port flag BR_MULTICAST_TO_UNICAST is set, never updates the previous
port pointer, therefore it is always going to be different from the
existing port in this deduplicated list iteration.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Acked-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 942f146a

net/bridge/br_forward.c

+4 −11
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ static struct net_bridge_port *maybe_deliver( 
	struct net_bridge_port *prev, struct net_bridge_port *p,

	struct sk_buff *skb, bool local_orig)

{

	u8 igmp_type = br_multicast_igmp_type(skb);

	int err;



	if (!should_deliver(p, skb))
@@ -184,8 +185,9 @@ static struct net_bridge_port *maybe_deliver( 
	err = deliver_clone(prev, skb, local_orig);

	if (err)

		return ERR_PTR(err);



out:

	br_multicast_count(p->br, p, skb, igmp_type, BR_MCAST_DIR_TX);



	return p;

}
@@ -193,7 +195,6 @@ out: 
void br_flood(struct net_bridge *br, struct sk_buff *skb,

	      enum br_pkt_type pkt_type, bool local_rcv, bool local_orig)

{

	u8 igmp_type = br_multicast_igmp_type(skb);

	struct net_bridge_port *prev = NULL;

	struct net_bridge_port *p;
@@ -226,9 +227,6 @@ void br_flood(struct net_bridge *br, struct sk_buff *skb, 
		prev = maybe_deliver(prev, p, skb, local_orig);

		if (IS_ERR(prev))

			goto out;

		if (prev == p)

			br_multicast_count(p->br, p, skb, igmp_type,

					   BR_MCAST_DIR_TX);

	}



	if (!prev)
@@ -277,7 +275,6 @@ void br_multicast_flood(struct net_bridge_mdb_entry *mdst, 
			bool local_rcv, bool local_orig)

{

	struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;

	u8 igmp_type = br_multicast_igmp_type(skb);

	struct net_bridge *br = netdev_priv(dev);

	struct net_bridge_port *prev = NULL;

	struct net_bridge_port_group *p;
@@ -304,13 +301,9 @@ void br_multicast_flood(struct net_bridge_mdb_entry *mdst, 
		}



		prev = maybe_deliver(prev, port, skb, local_orig);

delivered:

		if (IS_ERR(prev))

			goto out;

		if (prev == port)

			br_multicast_count(port->br, port, skb, igmp_type,

					   BR_MCAST_DIR_TX);



delivered:

		if ((unsigned long)lport >= (unsigned long)port)

			p = rcu_dereference(p->next);

		if ((unsigned long)rport >= (unsigned long)port)

CRA Git | Maintained and supported by SUSTech CRA and CCSE