diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-06 22:20:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-06 22:20:08 -0400 |
| commit | 216fe8f021e33c36e3b27c49c9f1951f6b037d7f (patch) | |
| tree | a43daec41b4d3955e7a4f8d0ed0654a7c80527ec /net/bridge/br_stp_if.c | |
| parent | 9747e2313838ee8f5d8073fd6aa7289255c3c51b (diff) | |
| parent | b29794ec95c6856b316c2295904208bf11ffddd9 (diff) | |
| download | linux-stable-216fe8f021e33c36e3b27c49c9f1951f6b037d7f.tar.gz linux-stable-216fe8f021e33c36e3b27c49c9f1951f6b037d7f.tar.bz2 linux-stable-216fe8f021e33c36e3b27c49c9f1951f6b037d7f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Just some simple overlapping changes in marvell PHY driver
and the DSA core code.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_stp_if.c')
| -rw-r--r-- | net/bridge/br_stp_if.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 4efd5d54498a..89110319ef0f 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -173,7 +173,8 @@ static void br_stp_start(struct net_bridge *br) br_debug(br, "using kernel STP\n"); /* To start timers on any ports left in blocking */ - mod_timer(&br->hello_timer, jiffies + br->hello_time); + if (br->dev->flags & IFF_UP) + mod_timer(&br->hello_timer, jiffies + br->hello_time); br_port_state_selection(br); } |