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)
 
         list_for_each_entry(p, &br->port_list, list) {
                 if (p->state != BR_STATE_DISABLED &&
-                    !memcmp(&p->designated_bridge, &br->bridge_id, 8)) 
+                    !memcmp(&p->designated_bridge, &br->bridge_id, 8))
                         return 1;
         }
 
@@ -37,7 +37,7 @@ static int br_is_designated_for_some_port(const struct net_bridge *br)
 static void br_hello_timer_expired(unsigned long arg)
 {
         struct net_bridge *br = (struct net_bridge *)arg;
-        
+
         pr_debug("%s: hello timer expired\n", br->dev->name);
         spin_lock(&br->lock);
         if (br->dev->flags & IFF_UP) {
@@ -58,11 +58,11 @@ static void br_message_age_timer_expired(unsigned long arg)
         if (p->state == BR_STATE_DISABLED)
                 return;
 
-        
+
         pr_info("%s: neighbor %.2x%.2x.%.2x:%.2x:%.2x:%.2x:%.2x:%.2x lost on port %d(%s)\n",
-                br->dev->name, 
-                id->prio[0], id->prio[1], 
-                id->addr[0], id->addr[1], id->addr[2], 
+                br->dev->name,
+                id->prio[0], id->prio[1],
+                id->addr[0], id->addr[1], id->addr[2],
                 id->addr[3], id->addr[4], id->addr[5],
                 p->port_no, p->dev->name);
 
@@ -114,7 +114,7 @@ static void br_tcn_timer_expired(unsigned long arg)
         spin_lock(&br->lock);
         if (br->dev->flags & IFF_UP) {
                 br_transmit_tcn(br);
-        
+
                 mod_timer(&br->tcn_timer,jiffies + br->bridge_hello_time);
         }
         spin_unlock(&br->lock);
@@ -135,7 +135,7 @@ static void br_hold_timer_expired(unsigned long arg)
 {
         struct net_bridge_port *p = (struct net_bridge_port *) arg;
 
-        pr_debug("%s: %d(%s) hold timer expired\n", 
+        pr_debug("%s: %d(%s) hold timer expired\n",
                  p->br->dev->name,  p->port_no, p->dev->name);
 
         spin_lock(&p->br->lock);
@@ -166,10 +166,10 @@ void br_stp_port_timer_init(struct net_bridge_port *p)
 
         setup_timer(&p->forward_delay_timer, br_forward_delay_timer_expired,
                       (unsigned long) p);
-                      
+
         setup_timer(&p->hold_timer, br_hold_timer_expired,
                       (unsigned long) p);
-}       
+}
 
 /* Report ticks left (in USER_HZ) used for API */
 unsigned long br_timer_value(const struct timer_list *timer)