aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/br_stp_timer.c
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2012-04-15 01:58:06 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-15 12:44:40 -0400
commit95c961747284a6b83a5e2d81240e214b0fa3464d (patch)
treec7be86a00db3605a48a03109fafcbe31039ca2e0 /net/bridge/br_stp_timer.c
parent5e73ea1a31c3612aa6dfe44f864ca5b7b6a4cff9 (diff)
net: cleanup unsigned to unsigned int
Use of "unsigned int" is preferred to bare "unsigned" in net tree. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> 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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c
index 58de2a0f9975..a6747e673426 100644
--- a/net/bridge/br_stp_timer.c
+++ b/net/bridge/br_stp_timer.c
@@ -56,7 +56,7 @@ static void br_message_age_timer_expired(unsigned long arg)
56 return; 56 return;
57 57
58 br_info(br, "port %u(%s) neighbor %.2x%.2x.%pM lost\n", 58 br_info(br, "port %u(%s) neighbor %.2x%.2x.%pM lost\n",
59 (unsigned) p->port_no, p->dev->name, 59 (unsigned int) p->port_no, p->dev->name,
60 id->prio[0], id->prio[1], &id->addr); 60 id->prio[0], id->prio[1], &id->addr);
61 61
62 /* 62 /*
@@ -84,7 +84,7 @@ static void br_forward_delay_timer_expired(unsigned long arg)
84 struct net_bridge *br = p->br; 84 struct net_bridge *br = p->br;
85 85
86 br_debug(br, "port %u(%s) forward delay timer\n", 86 br_debug(br, "port %u(%s) forward delay timer\n",
87 (unsigned) p->port_no, p->dev->name); 87 (unsigned int) p->port_no, p->dev->name);
88 spin_lock(&br->lock); 88 spin_lock(&br->lock);
89 if (p->state == BR_STATE_LISTENING) { 89 if (p->state == BR_STATE_LISTENING) {
90 p->state = BR_STATE_LEARNING; 90 p->state = BR_STATE_LEARNING;
@@ -131,7 +131,7 @@ static void br_hold_timer_expired(unsigned long arg)
131 struct net_bridge_port *p = (struct net_bridge_port *) arg; 131 struct net_bridge_port *p = (struct net_bridge_port *) arg;
132 132
133 br_debug(p->br, "port %u(%s) hold timer expired\n", 133 br_debug(p->br, "port %u(%s) hold timer expired\n",
134 (unsigned) p->port_no, p->dev->name); 134 (unsigned int) p->port_no, p->dev->name);
135 135
136 spin_lock(&p->br->lock); 136 spin_lock(&p->br->lock);
137 if (p->config_pending) 137 if (p->config_pending)