diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-02-09 09:24:35 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-11 02:19:23 -0500 |
commit | 9d6f229fc45b6ac268020c0c8eff29e94bb34381 (patch) | |
tree | c8f514f2f13ea563256d97a2627aac9f89c57bf5 /net/bridge/br_stp_timer.c | |
parent | 8e87d14255acffeee36873de226dc25c11b5f46d (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_timer.c')
-rw-r--r-- | net/bridge/br_stp_timer.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c index d0fcde82c6fc..030aa798fea7 100644 --- a/net/bridge/br_stp_timer.c +++ b/net/bridge/br_stp_timer.c | |||
@@ -27,7 +27,7 @@ static int br_is_designated_for_some_port(const struct net_bridge *br) | |||
27 | 27 | ||
28 | list_for_each_entry(p, &br->port_list, list) { | 28 | list_for_each_entry(p, &br->port_list, list) { |
29 | if (p->state != BR_STATE_DISABLED && | 29 | if (p->state != BR_STATE_DISABLED && |
30 | !memcmp(&p->designated_bridge, &br->bridge_id, 8)) | 30 | !memcmp(&p->designated_bridge, &br->bridge_id, 8)) |
31 | return 1; | 31 | return 1; |
32 | } | 32 | } |
33 | 33 | ||
@@ -37,7 +37,7 @@ static int br_is_designated_for_some_port(const struct net_bridge *br) | |||
37 | static void br_hello_timer_expired(unsigned long arg) | 37 | static void br_hello_timer_expired(unsigned long arg) |
38 | { | 38 | { |
39 | struct net_bridge *br = (struct net_bridge *)arg; | 39 | struct net_bridge *br = (struct net_bridge *)arg; |
40 | 40 | ||
41 | pr_debug("%s: hello timer expired\n", br->dev->name); | 41 | pr_debug("%s: hello timer expired\n", br->dev->name); |
42 | spin_lock(&br->lock); | 42 | spin_lock(&br->lock); |
43 | if (br->dev->flags & IFF_UP) { | 43 | if (br->dev->flags & IFF_UP) { |
@@ -58,11 +58,11 @@ static void br_message_age_timer_expired(unsigned long arg) | |||
58 | if (p->state == BR_STATE_DISABLED) | 58 | if (p->state == BR_STATE_DISABLED) |
59 | return; | 59 | return; |
60 | 60 | ||
61 | 61 | ||
62 | pr_info("%s: neighbor %.2x%.2x.%.2x:%.2x:%.2x:%.2x:%.2x:%.2x lost on port %d(%s)\n", | 62 | pr_info("%s: neighbor %.2x%.2x.%.2x:%.2x:%.2x:%.2x:%.2x:%.2x lost on port %d(%s)\n", |
63 | br->dev->name, | 63 | br->dev->name, |
64 | id->prio[0], id->prio[1], | 64 | id->prio[0], id->prio[1], |
65 | id->addr[0], id->addr[1], id->addr[2], | 65 | id->addr[0], id->addr[1], id->addr[2], |
66 | id->addr[3], id->addr[4], id->addr[5], | 66 | id->addr[3], id->addr[4], id->addr[5], |
67 | p->port_no, p->dev->name); | 67 | p->port_no, p->dev->name); |
68 | 68 | ||
@@ -114,7 +114,7 @@ static void br_tcn_timer_expired(unsigned long arg) | |||
114 | spin_lock(&br->lock); | 114 | spin_lock(&br->lock); |
115 | if (br->dev->flags & IFF_UP) { | 115 | if (br->dev->flags & IFF_UP) { |
116 | br_transmit_tcn(br); | 116 | br_transmit_tcn(br); |
117 | 117 | ||
118 | mod_timer(&br->tcn_timer,jiffies + br->bridge_hello_time); | 118 | mod_timer(&br->tcn_timer,jiffies + br->bridge_hello_time); |
119 | } | 119 | } |
120 | spin_unlock(&br->lock); | 120 | spin_unlock(&br->lock); |
@@ -135,7 +135,7 @@ static void br_hold_timer_expired(unsigned long arg) | |||
135 | { | 135 | { |
136 | struct net_bridge_port *p = (struct net_bridge_port *) arg; | 136 | struct net_bridge_port *p = (struct net_bridge_port *) arg; |
137 | 137 | ||
138 | pr_debug("%s: %d(%s) hold timer expired\n", | 138 | pr_debug("%s: %d(%s) hold timer expired\n", |
139 | p->br->dev->name, p->port_no, p->dev->name); | 139 | p->br->dev->name, p->port_no, p->dev->name); |
140 | 140 | ||
141 | spin_lock(&p->br->lock); | 141 | spin_lock(&p->br->lock); |
@@ -166,10 +166,10 @@ void br_stp_port_timer_init(struct net_bridge_port *p) | |||
166 | 166 | ||
167 | setup_timer(&p->forward_delay_timer, br_forward_delay_timer_expired, | 167 | setup_timer(&p->forward_delay_timer, br_forward_delay_timer_expired, |
168 | (unsigned long) p); | 168 | (unsigned long) p); |
169 | 169 | ||
170 | setup_timer(&p->hold_timer, br_hold_timer_expired, | 170 | setup_timer(&p->hold_timer, br_hold_timer_expired, |
171 | (unsigned long) p); | 171 | (unsigned long) p); |
172 | } | 172 | } |
173 | 173 | ||
174 | /* Report ticks left (in USER_HZ) used for API */ | 174 | /* Report ticks left (in USER_HZ) used for API */ |
175 | unsigned long br_timer_value(const struct timer_list *timer) | 175 | unsigned long br_timer_value(const struct timer_list *timer) |