diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /net/bridge/br_stp.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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) | |||
| 386 | else | 386 | else |
| 387 | p->state = BR_STATE_LEARNING; | 387 | p->state = BR_STATE_LEARNING; |
| 388 | 388 | ||
| 389 | br_multicast_enable_port(p); | ||
| 390 | |||
| 389 | br_log_state(p); | 391 | br_log_state(p); |
| 390 | 392 | ||
| 391 | if (br->forward_delay != 0) | 393 | if (br->forward_delay != 0) |