bridge: mrp: Rename br_mrp_port_open to br_mrp_ring_port_open

[linux-2.6-microblaze.git] / net / bridge / br_mrp.c

diff --git a/net/bridge/br_mrp.c b/net/bridge/br_mrp.c
index 90592af..fe7cf14 100644 (file)
--- a/net/bridge/br_mrp.c
+++ b/net/bridge/br_mrp.c
@@ -213,7 +213,7 @@ static void br_mrp_test_work_expired(struct work_struct *work)
                }
 
                if (notify_open && !mrp->ring_role_offloaded)
-                       br_mrp_port_open(p->dev, true);
+                       br_mrp_ring_port_open(p->dev, true);
        }
 
        p = rcu_dereference(mrp->s_port);
@@ -229,7 +229,7 @@ static void br_mrp_test_work_expired(struct work_struct *work)
                }
 
                if (notify_open && !mrp->ring_role_offloaded)
-                       br_mrp_port_open(p->dev, true);
+                       br_mrp_ring_port_open(p->dev, true);
        }
 
 out:
@@ -537,7 +537,7 @@ static void br_mrp_mrm_process(struct br_mrp *mrp, struct net_bridge_port *port,
         * not closed
         */
        if (mrp->ring_state != BR_MRP_RING_STATE_CLOSED)
-               br_mrp_port_open(port->dev, false);
+               br_mrp_ring_port_open(port->dev, false);
 }
 
 /* Determin if the test hdr has a better priority than the node */