diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-12-19 19:27:34 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-19 19:27:34 -0500 |
| commit | 852ad5e631967ae2203cb08c5b6b42c26011ed63 (patch) | |
| tree | 09ff43c85794f466b2c5868a611613088fb68a23 /net/bridge/br_stp_timer.c | |
| parent | bnx2x: cleanup skb_set_hash (diff) | |
| parent | bridge: change the position of '{' to the pre line (diff) | |
| download | linux-dev-852ad5e631967ae2203cb08c5b6b42c26011ed63.tar.xz linux-dev-852ad5e631967ae2203cb08c5b6b42c26011ed63.zip | |
Merge branch 'bridge_cleanups'
Tan Xiaojun says:
====================
bridge: cleanup and fix checkpatch errors
Clean up and fix some checkpatch errors in bridge driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
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 950663d4d330..558c46d19e05 100644 --- a/net/bridge/br_stp_timer.c +++ b/net/bridge/br_stp_timer.c @@ -110,7 +110,7 @@ static void br_tcn_timer_expired(unsigned long arg) if (!br_is_root_bridge(br) && (br->dev->flags & IFF_UP)) { br_transmit_tcn(br); - mod_timer(&br->tcn_timer,jiffies + br->bridge_hello_time); + mod_timer(&br->tcn_timer, jiffies + br->bridge_hello_time); } spin_unlock(&br->lock); } |