bridge br_multicast: BUG: unable to handle kernel NULL pointer dereference

[linux-drm-fsl-dcu.git] / net / bridge / br_stp_timer.c

diff --git a/net/bridge/br_stp_timer.c b/net/bridge/br_stp_timer.c
index 772a140bfdf0f8edc2f9692bf7d001d5dbf97954..7b22456023c5615642b3c1a786bc135065aeb990 100644 (file)
--- a/net/bridge/br_stp_timer.c
+++ b/net/bridge/br_stp_timer.c
@@ -35,7 +35,7 @@ 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);
+       br_debug(br, "hello timer expired\n");
        spin_lock(&br->lock);
        if (br->dev->flags & IFF_UP) {
                br_config_bpdu_generation(br);
@@ -55,13 +55,9 @@ 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],
-               id->addr[3], id->addr[4], id->addr[5],
-               p->port_no, p->dev->name);
+       br_info(br, "port %u(%s) neighbor %.2x%.2x.%pM lost\n",
+               (unsigned) p->port_no, p->dev->name,
+               id->prio[0], id->prio[1], &id->addr);
 
        /*
         * According to the spec, the message age timer cannot be
@@ -87,8 +83,8 @@ static void br_forward_delay_timer_expired(unsigned long arg)
        struct net_bridge_port *p = (struct net_bridge_port *) arg;
        struct net_bridge *br = p->br;
 
-       pr_debug("%s: %d(%s) forward delay timer\n",
-                br->dev->name, p->port_no, p->dev->name);
+       br_debug(br, "port %u(%s) forward delay timer\n",
+                (unsigned) p->port_no, p->dev->name);
        spin_lock(&br->lock);
        if (p->state == BR_STATE_LISTENING) {
                p->state = BR_STATE_LEARNING;
@@ -107,7 +103,7 @@ static void br_tcn_timer_expired(unsigned long arg)
 {
        struct net_bridge *br = (struct net_bridge *) arg;
 
-       pr_debug("%s: tcn timer expired\n", br->dev->name);
+       br_debug(br, "tcn timer expired\n");
        spin_lock(&br->lock);
        if (br->dev->flags & IFF_UP) {
                br_transmit_tcn(br);
@@ -121,7 +117,7 @@ static void br_topology_change_timer_expired(unsigned long arg)
 {
        struct net_bridge *br = (struct net_bridge *) arg;
 
-       pr_debug("%s: topo change timer expired\n", br->dev->name);
+       br_debug(br, "topo change timer expired\n");
        spin_lock(&br->lock);
        br->topology_change_detected = 0;
        br->topology_change = 0;
@@ -132,8 +128,8 @@ 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",
-                p->br->dev->name,  p->port_no, p->dev->name);
+       br_debug(p->br, "port %u(%s) hold timer expired\n",
+                (unsigned) p->port_no, p->dev->name);
 
        spin_lock(&p->br->lock);
        if (p->config_pending)