lkml.org 
[lkml]   [2020]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v4 05/12] bridge: mrp: Rename br_mrp_port_open to br_mrp_ring_port_open
    Date
    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>
    ---
    net/bridge/br_mrp.c | 6 +++---
    net/bridge/br_mrp_netlink.c | 2 +-
    net/bridge/br_private_mrp.h | 2 +-
    3 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/net/bridge/br_mrp.c b/net/bridge/br_mrp.c
    index 90592af9db619..fe7cf1446b58a 100644
    --- 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 c4f5c356811f3..acce300c0cc29 100644
    --- a/net/bridge/br_mrp_netlink.c
    +++ b/net/bridge/br_mrp_netlink.c
    @@ -368,7 +368,7 @@ int br_mrp_fill_info(struct sk_buff *skb, struct net_bridge *br)
    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 8841ba847fb29..e93c8f9d4df58 100644
    --- 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 */
    --
    2.27.0
    \
     
     \ /
      Last update: 2020-07-14 09:40    [W:4.075 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site