AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

bridge: mrp: Rename br_mrp_port_open to br_mrp_ring_port_open

Browse Source 
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>
This commit is contained in:
Horatiu Vultur 2020-07-14 09:34:51 +02:00 committed by David S. Miller
parent 78c1b4fb0e
commit 4cc625c63a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/bridge/br_mrp.c
View File

@ -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 */

2
net/bridge/br_mrp_netlink.c
View File

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

2
net/bridge/br_private_mrp.h
View File

@ -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 */