diff options
author | David S. Miller | 2017-05-23 05:32:48 +0200 |
---|---|---|
committer | David S. Miller | 2017-05-23 05:32:48 +0200 |
commit | 218b6a5b23e939caf2064549b1cb61ba22b9d0a1 (patch) | |
tree | bdabf5439fb58905268953165779614d2aadb677 /net/bridge/br_stp_timer.c | |
parent | Merge branch 'dsa-distribute-switch-events' (diff) | |
parent | Merge tag 'pstore-v4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
download | kernel-qcow2-linux-218b6a5b23e939caf2064549b1cb61ba22b9d0a1.tar.gz kernel-qcow2-linux-218b6a5b23e939caf2064549b1cb61ba22b9d0a1.tar.xz kernel-qcow2-linux-218b6a5b23e939caf2064549b1cb61ba22b9d0a1.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/bridge/br_stp_timer.c')
-rw-r--r-- | net/bridge/br_stp_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c index c98b3e5c140a..60b6fe277a8b 100644 --- a/net/bridge/br_stp_timer.c +++ b/net/bridge/br_stp_timer.c @@ -40,7 +40,7 @@ static void br_hello_timer_expired(unsigned long arg) if (br->dev->flags & IFF_UP) { br_config_bpdu_generation(br); - if (br->stp_enabled != BR_USER_STP) + if (br->stp_enabled == BR_KERNEL_STP) mod_timer(&br->hello_timer, round_jiffies(jiffies + br->hello_time)); } |