diff options
Diffstat (limited to 'net/bridge/br_stp_if.c')
-rw-r--r-- | net/bridge/br_stp_if.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index d294224592db..58d13f2bd121 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c | |||
@@ -28,7 +28,7 @@ | |||
28 | */ | 28 | */ |
29 | static inline port_id br_make_port_id(__u8 priority, __u16 port_no) | 29 | static inline port_id br_make_port_id(__u8 priority, __u16 port_no) |
30 | { | 30 | { |
31 | return ((u16)priority << BR_PORT_BITS) | 31 | return ((u16)priority << BR_PORT_BITS) |
32 | | (port_no & ((1<<BR_PORT_BITS)-1)); | 32 | | (port_no & ((1<<BR_PORT_BITS)-1)); |
33 | } | 33 | } |
34 | 34 | ||
@@ -50,7 +50,7 @@ void br_stp_enable_bridge(struct net_bridge *br) | |||
50 | spin_lock_bh(&br->lock); | 50 | spin_lock_bh(&br->lock); |
51 | mod_timer(&br->hello_timer, jiffies + br->hello_time); | 51 | mod_timer(&br->hello_timer, jiffies + br->hello_time); |
52 | mod_timer(&br->gc_timer, jiffies + HZ/10); | 52 | mod_timer(&br->gc_timer, jiffies + HZ/10); |
53 | 53 | ||
54 | br_config_bpdu_generation(br); | 54 | br_config_bpdu_generation(br); |
55 | 55 | ||
56 | list_for_each_entry(p, &br->port_list, list) { | 56 | list_for_each_entry(p, &br->port_list, list) { |