diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-26 12:16:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-26 12:16:46 -0700 |
| commit | 2bd93d7af1581d40e3c4b25242472661cb7c637a (patch) | |
| tree | 43c638422d20857339d8d908d6b65ebb8045edc0 /net/bridge | |
| parent | 64cad2ade1e6f890531a58318ca9ee013f92ef2f (diff) | |
| parent | 0972ddb2373d5e127aabdcabd8305eff0242cd0b (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.
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 785932d7ad3..f3ac1e858ee 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c @@ -165,7 +165,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, |