bridge: mrp: Rename br_mrp_port_open to br_mrp_ring_port_open

This patch renames the function br_mrp_port_open to
br_mrp_ring_port_open. In this way is more clear that a ring port lost
the continuity because there will be also a br_mrp_in_port_open.

Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_mrp.c b/net/bridge/br_mrp.c
index 90592af9db619fcd7b87d153f473caf582888d88..fe7cf1446b58a040d2f4763e7b2814bf91750970 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 */

diff --git a/net/bridge/br_mrp_netlink.c b/net/bridge/br_mrp_netlink.c
index c4f5c356811f3100d6928db02808cd8412a291b4..acce300c0cc29e39e407a8295a232ed9a3dccbbc 100644 (file)
--- a/net/bridge/br_mrp_netlink.c
+++ b/net/bridge/br_mrp_netlink.c
@@ -368,7 +368,7 @@ nla_info_failure:
        return -EMSGSIZE;
 }
 
-int br_mrp_port_open(struct net_device *dev, u8 loc)
+int br_mrp_ring_port_open(struct net_device *dev, u8 loc)
 {
        struct net_bridge_port *p;
        int err = 0;

diff --git a/net/bridge/br_private_mrp.h b/net/bridge/br_private_mrp.h
index 8841ba847fb29a6aa5b48fc0dfcc2814cd6a5847..e93c8f9d4df58ca7ad0dce48091ba80f326bcbc6 100644 (file)
--- a/net/bridge/br_private_mrp.h
+++ b/net/bridge/br_private_mrp.h
@@ -74,6 +74,6 @@ int br_mrp_port_switchdev_set_role(struct net_bridge_port *p,
                                   enum br_mrp_port_role_type role);
 
 /* br_mrp_netlink.c  */
-int br_mrp_port_open(struct net_device *dev, u8 loc);
+int br_mrp_ring_port_open(struct net_device *dev, u8 loc);
 
 #endif /* _BR_PRIVATE_MRP_H */