diff options
Diffstat (limited to 'net/bridge/br_stp.c')
-rw-r--r-- | net/bridge/br_stp.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c index edcf14b560f6..57186d84d2bd 100644 --- a/net/bridge/br_stp.c +++ b/net/bridge/br_stp.c | |||
@@ -31,10 +31,9 @@ static const char *const br_port_state_names[] = { | |||
31 | 31 | ||
32 | void br_log_state(const struct net_bridge_port *p) | 32 | void br_log_state(const struct net_bridge_port *p) |
33 | { | 33 | { |
34 | pr_info("%s: port %d(%s) entering %s state\n", | 34 | br_info(p->br, "port %u(%s) entering %s state\n", |
35 | p->br->dev->name, p->port_no, p->dev->name, | 35 | (unsigned) p->port_no, p->dev->name, |
36 | br_port_state_names[p->state]); | 36 | br_port_state_names[p->state]); |
37 | |||
38 | } | 37 | } |
39 | 38 | ||
40 | /* called under bridge lock */ | 39 | /* called under bridge lock */ |
@@ -300,7 +299,7 @@ void br_topology_change_detection(struct net_bridge *br) | |||
300 | if (br->stp_enabled != BR_KERNEL_STP) | 299 | if (br->stp_enabled != BR_KERNEL_STP) |
301 | return; | 300 | return; |
302 | 301 | ||
303 | pr_info("%s: topology change detected, %s\n", br->dev->name, | 302 | br_info(br, "topology change detected, %s\n", |
304 | isroot ? "propagating" : "sending tcn bpdu"); | 303 | isroot ? "propagating" : "sending tcn bpdu"); |
305 | 304 | ||
306 | if (isroot) { | 305 | if (isroot) { |
@@ -469,8 +468,8 @@ void br_received_config_bpdu(struct net_bridge_port *p, struct br_config_bpdu *b | |||
469 | void br_received_tcn_bpdu(struct net_bridge_port *p) | 468 | void br_received_tcn_bpdu(struct net_bridge_port *p) |
470 | { | 469 | { |
471 | if (br_is_designated_port(p)) { | 470 | if (br_is_designated_port(p)) { |
472 | pr_info("%s: received tcn bpdu on port %i(%s)\n", | 471 | br_info(p->br, "port %u(%s) received tcn bpdu\n", |
473 | p->br->dev->name, p->port_no, p->dev->name); | 472 | (unsigned) p->port_no, p->dev->name); |
474 | 473 | ||
475 | br_topology_change_detection(p->br); | 474 | br_topology_change_detection(p->br); |
476 | br_topology_change_acknowledge(p); | 475 | br_topology_change_acknowledge(p); |