aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/br_stp.c
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2007-02-09 09:24:35 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-11 02:19:23 -0500
commit9d6f229fc45b6ac268020c0c8eff29e94bb34381 (patch)
treec8f514f2f13ea563256d97a2627aac9f89c57bf5 /net/bridge/br_stp.c
parent8e87d14255acffeee36873de226dc25c11b5f46d (diff)
[NET] BRIDGE: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_stp.c')
-rw-r--r--net/bridge/br_stp.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index 04ca0639a95a..f9ff4d57b0d7 100644
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -24,17 +24,17 @@
24#define MESSAGE_AGE_INCR ((HZ < 256) ? 1 : (HZ/256)) 24#define MESSAGE_AGE_INCR ((HZ < 256) ? 1 : (HZ/256))
25 25
26static const char *br_port_state_names[] = { 26static const char *br_port_state_names[] = {
27 [BR_STATE_DISABLED] = "disabled", 27 [BR_STATE_DISABLED] = "disabled",
28 [BR_STATE_LISTENING] = "listening", 28 [BR_STATE_LISTENING] = "listening",
29 [BR_STATE_LEARNING] = "learning", 29 [BR_STATE_LEARNING] = "learning",
30 [BR_STATE_FORWARDING] = "forwarding", 30 [BR_STATE_FORWARDING] = "forwarding",
31 [BR_STATE_BLOCKING] = "blocking", 31 [BR_STATE_BLOCKING] = "blocking",
32}; 32};
33 33
34void br_log_state(const struct net_bridge_port *p) 34void br_log_state(const struct net_bridge_port *p)
35{ 35{
36 pr_info("%s: port %d(%s) entering %s state\n", 36 pr_info("%s: port %d(%s) entering %s state\n",
37 p->br->dev->name, p->port_no, p->dev->name, 37 p->br->dev->name, p->port_no, p->dev->name,
38 br_port_state_names[p->state]); 38 br_port_state_names[p->state]);
39 39
40} 40}
@@ -53,7 +53,7 @@ struct net_bridge_port *br_get_port(struct net_bridge *br, u16 port_no)
53} 53}
54 54
55/* called under bridge lock */ 55/* called under bridge lock */
56static int br_should_become_root_port(const struct net_bridge_port *p, 56static int br_should_become_root_port(const struct net_bridge_port *p,
57 u16 root_port) 57 u16 root_port)
58{ 58{
59 struct net_bridge *br; 59 struct net_bridge *br;
@@ -184,7 +184,7 @@ void br_transmit_config(struct net_bridge_port *p)
184} 184}
185 185
186/* called under bridge lock */ 186/* called under bridge lock */
187static inline void br_record_config_information(struct net_bridge_port *p, 187static inline void br_record_config_information(struct net_bridge_port *p,
188 const struct br_config_bpdu *bpdu) 188 const struct br_config_bpdu *bpdu)
189{ 189{
190 p->designated_root = bpdu->root; 190 p->designated_root = bpdu->root;
@@ -192,12 +192,12 @@ static inline void br_record_config_information(struct net_bridge_port *p,
192 p->designated_bridge = bpdu->bridge_id; 192 p->designated_bridge = bpdu->bridge_id;
193 p->designated_port = bpdu->port_id; 193 p->designated_port = bpdu->port_id;
194 194
195 mod_timer(&p->message_age_timer, jiffies 195 mod_timer(&p->message_age_timer, jiffies
196 + (p->br->max_age - bpdu->message_age)); 196 + (p->br->max_age - bpdu->message_age));
197} 197}
198 198
199/* called under bridge lock */ 199/* called under bridge lock */
200static inline void br_record_config_timeout_values(struct net_bridge *br, 200static inline void br_record_config_timeout_values(struct net_bridge *br,
201 const struct br_config_bpdu *bpdu) 201 const struct br_config_bpdu *bpdu)
202{ 202{
203 br->max_age = bpdu->max_age; 203 br->max_age = bpdu->max_age;
@@ -415,7 +415,7 @@ void br_received_config_bpdu(struct net_bridge_port *p, struct br_config_bpdu *b
415{ 415{
416 struct net_bridge *br; 416 struct net_bridge *br;
417 int was_root; 417 int was_root;
418 418
419 br = p->br; 419 br = p->br;
420 was_root = br_is_root_bridge(br); 420 was_root = br_is_root_bridge(br);
421 421
@@ -430,7 +430,7 @@ void br_received_config_bpdu(struct net_bridge_port *p, struct br_config_bpdu *b
430 del_timer(&br->topology_change_timer); 430 del_timer(&br->topology_change_timer);
431 br_transmit_tcn(br); 431 br_transmit_tcn(br);
432 432
433 mod_timer(&br->tcn_timer, 433 mod_timer(&br->tcn_timer,
434 jiffies + br->bridge_hello_time); 434 jiffies + br->bridge_hello_time);
435 } 435 }
436 } 436 }
@@ -441,8 +441,8 @@ void br_received_config_bpdu(struct net_bridge_port *p, struct br_config_bpdu *b
441 if (bpdu->topology_change_ack) 441 if (bpdu->topology_change_ack)
442 br_topology_change_acknowledged(br); 442 br_topology_change_acknowledged(br);
443 } 443 }
444 } else if (br_is_designated_port(p)) { 444 } else if (br_is_designated_port(p)) {
445 br_reply(p); 445 br_reply(p);
446 } 446 }
447} 447}
448 448