diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-21 21:17:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-21 21:17:25 -0700 |
| commit | f01cb5fbea1c1613621f9f32f385e12c1a29dde0 (patch) | |
| tree | 011167bc13e0911a6638abce448098dee952c371 /net/bridge | |
| parent | cb771838715b1c470bc5735bdae709b33b18e0ad (diff) | |
| download | linux-stable-f01cb5fbea1c1613621f9f32f385e12c1a29dde0.tar.gz linux-stable-f01cb5fbea1c1613621f9f32f385e12c1a29dde0.tar.bz2 linux-stable-f01cb5fbea1c1613621f9f32f385e12c1a29dde0.zip | |
Revert "bridge: Forward reserved group addresses if !STP"
This reverts commit 1e253c3b8a1aeed51eef6fc366812f219b97de65.
It breaks 802.3ad bonding inside of a bridge.
The commit was meant to support transport bridging, and specifically
virtual machines bridged to an ethernet interface connected to a
switch port wiht 802.1x enabled.
But this isn't the way to do it, it breaks too many other things.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index e2160792e1bc..0c7badad62af 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -164,7 +164,7 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb) goto drop; /* If STP is turned off, then forward */ - if (p->br->stp_enabled == BR_NO_STP) + if (p->br->stp_enabled == BR_NO_STP && dest[5] == 0) goto forward; if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev, |