Commit 4cc625c6 authored by Horatiu Vultur's avatar Horatiu Vultur Committed by David S. Miller
Browse files

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: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Acked-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 78c1b4fb

net/bridge/br_mrp.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -213,7 +213,7 @@ static void br_mrp_test_work_expired(struct work_struct *work) 
		}

		}





		if (notify_open && !mrp->ring_role_offloaded)

		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);

	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)

		if (notify_open && !mrp->ring_role_offloaded)

			br_mrp_port_open(p->dev, true);

			br_mrp_ring_port_open(p->dev, true);

	}

	}





out:

out:
@@ -537,7 +537,7 @@ static void br_mrp_mrm_process(struct br_mrp *mrp, struct net_bridge_port *port, 
	 * not closed

	 * not closed

	 */

	 */

	if (mrp->ring_state != BR_MRP_RING_STATE_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 */

/* Determin if the test hdr has a better priority than the node */

net/bridge/br_mrp_netlink.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -368,7 +368,7 @@ int br_mrp_fill_info(struct sk_buff *skb, struct net_bridge *br) 
	return -EMSGSIZE;

	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;

	struct net_bridge_port *p;

	int err = 0;

	int err = 0;

net/bridge/br_private_mrp.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,6 +74,6 @@ int br_mrp_port_switchdev_set_role(struct net_bridge_port *p, 
				   enum br_mrp_port_role_type role);

				   enum br_mrp_port_role_type role);





/* br_mrp_netlink.c  */

/* 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 */
 
#endif /* _BR_PRIVATE_MRP_H */