From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
To: Horatiu Vultur <horatiu.vultur@microchip.com>,
jiri@resnulli.us, ivecera@redhat.com, davem@davemloft.net,
kuba@kernel.org, roopa@cumulusnetworks.com, andrew@lunn.ch,
UNGLinuxDriver@microchip.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, bridge@lists.linux-foundation.org
Subject: Re: [PATCH 3/3] bridge: mrp: Restore port state when deleting MRP instance
Date: Thu, 21 May 2020 11:18:20 +0300 [thread overview]
Message-ID: <05ddf496-9f6d-ae23-1bdb-40f0fe0e3b3c@cumulusnetworks.com> (raw)
In-Reply-To: <20200520130923.3196432-4-horatiu.vultur@microchip.com>
On 20/05/2020 16:09, Horatiu Vultur wrote:
> When a MRP instance is deleted, then restore the port according to the
> bridge state. If the bridge is up then the ports will be in forwarding
> state otherwise will be in disabled state.
>
> Fixes: 9a9f26e8f7ea ("bridge: mrp: Connect MRP API with the switchdev API")
> Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
> ---
> net/bridge/br_mrp.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
> diff --git a/net/bridge/br_mrp.c b/net/bridge/br_mrp.c
> index a5a3fa59c078a..bdd8920c15053 100644
> --- a/net/bridge/br_mrp.c
> +++ b/net/bridge/br_mrp.c
> @@ -229,6 +229,7 @@ static void br_mrp_test_work_expired(struct work_struct *work)
> static void br_mrp_del_impl(struct net_bridge *br, struct br_mrp *mrp)
> {
> struct net_bridge_port *p;
> + u8 state;
>
> /* Stop sending MRP_Test frames */
> cancel_delayed_work_sync(&mrp->test_work);
> @@ -240,20 +241,24 @@ static void br_mrp_del_impl(struct net_bridge *br, struct br_mrp *mrp)
> p = rtnl_dereference(mrp->p_port);
> if (p) {
> spin_lock_bh(&br->lock);
> - p->state = BR_STATE_FORWARDING;
> + state = netif_running(br->dev) ?
> + BR_STATE_FORWARDING : BR_STATE_DISABLED;
> + p->state = state;
> p->flags &= ~BR_MRP_AWARE;
> spin_unlock_bh(&br->lock);
> - br_mrp_port_switchdev_set_state(p, BR_STATE_FORWARDING);
> + br_mrp_port_switchdev_set_state(p, state);
> rcu_assign_pointer(mrp->p_port, NULL);
> }
>
> p = rtnl_dereference(mrp->s_port);
> if (p) {
> spin_lock_bh(&br->lock);
> - p->state = BR_STATE_FORWARDING;
> + state = netif_running(br->dev) ?
> + BR_STATE_FORWARDING : BR_STATE_DISABLED;
> + p->state = state;
> p->flags &= ~BR_MRP_AWARE;
> spin_unlock_bh(&br->lock);
> - br_mrp_port_switchdev_set_state(p, BR_STATE_FORWARDING);
> + br_mrp_port_switchdev_set_state(p, state);
> rcu_assign_pointer(mrp->s_port, NULL);
> }
>
>
prev parent reply other threads:[~2020-05-21 8:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 13:09 [PATCH 0/3] net: bridge: mrp: Add small fixes to MRP Horatiu Vultur
2020-05-20 13:09 ` [PATCH 1/3] bridge: mrp: Add br_mrp_unique_ifindex function Horatiu Vultur
2020-05-21 8:16 ` Nikolay Aleksandrov
2020-05-21 18:49 ` Horatiu Vultur
2020-05-21 16:58 ` Nikolay Aleksandrov
2020-05-21 19:30 ` Horatiu Vultur
2020-05-20 13:09 ` [PATCH 2/3] switchdev: mrp: Remove the variable mrp_ring_state Horatiu Vultur
2020-05-20 15:56 ` Ivan Vecera
2020-05-20 13:09 ` [PATCH 3/3] bridge: mrp: Restore port state when deleting MRP instance Horatiu Vultur
2020-05-21 8:18 ` Nikolay Aleksandrov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=05ddf496-9f6d-ae23-1bdb-40f0fe0e3b3c@cumulusnetworks.com \
--to=nikolay@cumulusnetworks.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=andrew@lunn.ch \
--cc=bridge@lists.linux-foundation.org \
--cc=davem@davemloft.net \
--cc=horatiu.vultur@microchip.com \
--cc=ivecera@redhat.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=roopa@cumulusnetworks.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).