From fbf2951bc7517fa4ef803ab16bfa3c0640397c73 Mon Sep 17 00:00:00 2001 From: Benjamin Poirier Date: Mon, 18 Oct 2010 16:09:35 +0000 Subject: [PATCH] --- yaml --- r: 215429 b: refs/heads/master c: 1e253c3b8a1aeed51eef6fc366812f219b97de65 h: refs/heads/master i: 215427: 06f33cee03bf93cc319b8b8fd1a6ee344f76cbcd v: v3 --- [refs] | 2 +- trunk/net/bridge/br_input.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bf48fa3ae60c..867e5f27bb62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5c30b349b872aa2ac13babbd5ceb26737f17e95 +refs/heads/master: 1e253c3b8a1aeed51eef6fc366812f219b97de65 diff --git a/trunk/net/bridge/br_input.c b/trunk/net/bridge/br_input.c index 6d04cfdf4541..25207a1f182b 100644 --- a/trunk/net/bridge/br_input.c +++ b/trunk/net/bridge/br_input.c @@ -159,7 +159,7 @@ struct sk_buff *br_handle_frame(struct sk_buff *skb) goto drop; /* If STP is turned off, then forward */ - if (p->br->stp_enabled == BR_NO_STP && dest[5] == 0) + if (p->br->stp_enabled == BR_NO_STP) goto forward; if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,