netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jiri Pirko <jiri@resnulli.us>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, idosch@mellanox.com, eladr@mellanox.com,
	yotamg@mellanox.com, nogahf@mellanox.com, ogerlitz@mellanox.com,
	ilant@mellanox.com
Subject: [patch net v2 09/10] mlxsw: spectrum: Unmap 802.1Q FID before destroying it
Date: Wed, 17 Aug 2016 16:39:36 +0200	[thread overview]
Message-ID: <1471444777-3412-10-git-send-email-jiri@resnulli.us> (raw)
In-Reply-To: <1471444777-3412-1-git-send-email-jiri@resnulli.us>

From: Ido Schimmel <idosch@mellanox.com>

Before destroying the 802.1Q FID we should first remove the VID-to-FID
mapping. This makes mlxsw_sp_fid_destroy() symmetric with regards to
mlxsw_sp_fid_create().

Fixes: 14d39461b3f4 ("mlxsw: spectrum: Use per-FID struct for the VLAN-aware bridge")
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
 drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
index b5e864d..d1b59cd 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
@@ -450,6 +450,8 @@ void mlxsw_sp_fid_destroy(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_fid *f)
 
 	kfree(f);
 
+	mlxsw_sp_fid_map(mlxsw_sp, fid, false);
+
 	mlxsw_sp_fid_op(mlxsw_sp, fid, false);
 }
 
-- 
2.5.5

  parent reply	other threads:[~2016-08-17 14:39 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-17 14:39 [patch net v2 00/10] mlxsw: IPv4 UC router fixes Jiri Pirko
2016-08-17 14:39 ` [patch net v2 01/10] mlxsw: spectrum: Don't return upon error in removal path Jiri Pirko
2016-08-17 14:39 ` [patch net v2 02/10] mlxsw: spectrum: Remove redundant errors from the code Jiri Pirko
2016-08-17 14:39 ` [patch net v2 03/10] mlxsw: spectrum: Create PVID vPort before registering netdevice Jiri Pirko
2016-08-17 14:39 ` [patch net v2 04/10] mlxsw: spectrum: Mark port as active before registering it Jiri Pirko
2016-08-17 14:39 ` [patch net v2 05/10] mlxsw: spectrum: Add missing packet traps Jiri Pirko
2016-08-17 14:39 ` [patch net v2 06/10] mlxsw: spectrum: Trap loop-backed packets Jiri Pirko
2016-08-17 14:39 ` [patch net v2 07/10] mlxsw: reg: Fix missing op field fill-up Jiri Pirko
2016-08-17 14:39 ` [patch net v2 08/10] mlxsw: spectrum: Add missing rollbacks in error path Jiri Pirko
2016-08-17 14:39 ` Jiri Pirko [this message]
2016-08-17 14:39 ` [patch net v2 10/10] mlxsw: spectrum: Allow packets to be trapped from any PG Jiri Pirko
2016-08-17 23:19 ` [patch net v2 00/10] mlxsw: IPv4 UC router fixes David Miller

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=1471444777-3412-10-git-send-email-jiri@resnulli.us \
    --to=jiri@resnulli.us \
    --cc=davem@davemloft.net \
    --cc=eladr@mellanox.com \
    --cc=idosch@mellanox.com \
    --cc=ilant@mellanox.com \
    --cc=netdev@vger.kernel.org \
    --cc=nogahf@mellanox.com \
    --cc=ogerlitz@mellanox.com \
    --cc=yotamg@mellanox.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).