diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-31 06:55:14 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-31 06:55:14 +0200 |
| commit | 3595be778d8cb887f0e0575ef0a0c1a094d120bb (patch) | |
| tree | 15671ed8bd3597d2efe13aa57b755c66014acb57 /net/bridge/br_stp.c | |
| parent | drm/radeon/kms: disable MSI on IGP chips (diff) | |
| parent | Linux 2.6.34-rc2 (diff) | |
| download | linux-3595be778d8cb887f0e0575ef0a0c1a094d120bb.tar.xz linux-3595be778d8cb887f0e0575ef0a0c1a094d120bb.zip | |
Merge branch 'v2.6.34-rc2' into drm-linus
Diffstat (limited to 'net/bridge/br_stp.c')
| -rw-r--r-- | net/bridge/br_stp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index fd3f8d6c0998..edcf14b560f6 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c @@ -386,6 +386,8 @@ static void br_make_forwarding(struct net_bridge_port *p) else p->state = BR_STATE_LEARNING; + br_multicast_enable_port(p); + br_log_state(p); if (br->forward_delay != 0) |