Commit a598f6ae authored May 15, 2009 by Stephen Hemminger Committed by David S. Miller May 17, 2009

bridge: relay bridge multicast pkgs if !STP



Currently the bridge catches all STP packets; even if STP is turned
off.  This prevents other systems (which do have STP turned on)
from being able to detect loops in the network.

With this patch, if STP is off, then any packet sent to the STP
multicast group address is forwarded to all ports.

Based on earlier patch by Joakim Tjernlund with changes
to go through forwarding (not local chain), and optimization
that only last octet needs to be checked.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a8f492c6

net/bridge/br_input.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -134,6 +134,10 @@ struct sk_buff br_handle_frame(struct net_bridge_port p, struct sk_buff *skb)
		if (skb->protocol == htons(ETH_P_PAUSE))
		goto drop;

		/* If STP is turned off, then forward */
		if (p->br->stp_enabled == BR_NO_STP && dest[5] == 0)
		goto forward;

		if (NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
		NULL, br_handle_local_finish))
		return NULL; /* frame consumed by filter */
		@@ -141,6 +145,7 @@ struct sk_buff br_handle_frame(struct net_bridge_port p, struct sk_buff *skb)
		return skb; /* continue processing */
		}

		forward:
		switch (p->state) {
		case BR_STATE_FORWARDING:
		rhook = rcu_dereference(br_should_route_hook);

Admin message