From: linux@treblig.org
To: anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com,
andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com,
intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
"Dr. David Alan Gilbert" <linux@treblig.org>
Subject: [RFC net-next 6/9] i40e: Remove unused i40e_del_filter
Date: Sat, 21 Dec 2024 18:42:44 +0000 [thread overview]
Message-ID: <20241221184247.118752-7-linux@treblig.org> (raw)
In-Reply-To: <20241221184247.118752-1-linux@treblig.org>
From: "Dr. David Alan Gilbert" <linux@treblig.org>
The last use of i40e_del_filter() was removed in 2016 by
commit 9569a9a4547d ("i40e: when adding or removing MAC filters, correctly
handle VLANs")
Remove it.
Fix up a comment that referenced it.
Note: The __ version of this function is still used.
Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
---
drivers/net/ethernet/intel/i40e/i40e.h | 1 -
drivers/net/ethernet/intel/i40e/i40e_main.c | 28 ++-------------------
2 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index 5d9738b746f4..399a5dbf3506 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -1196,7 +1196,6 @@ void i40e_set_ethtool_ops(struct net_device *netdev);
struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi,
const u8 *macaddr, s16 vlan);
void __i40e_del_filter(struct i40e_vsi *vsi, struct i40e_mac_filter *f);
-void i40e_del_filter(struct i40e_vsi *vsi, const u8 *macaddr, s16 vlan);
int i40e_sync_vsi_filters(struct i40e_vsi *vsi);
struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type,
u16 uplink, u32 param1);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 83ba1effe8ba..276dde0bc1d4 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -1666,9 +1666,8 @@ struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi,
* @vsi: VSI to remove from
* @f: the filter to remove from the list
*
- * This function should be called instead of i40e_del_filter only if you know
- * the exact filter you will remove already, such as via i40e_find_filter or
- * i40e_find_mac.
+ * This function requires you've found * the exact filter you will remove
+ * already, such as via i40e_find_filter or i40e_find_mac.
*
* NOTE: This function is expected to be called with mac_filter_hash_lock
* being held.
@@ -1697,29 +1696,6 @@ void __i40e_del_filter(struct i40e_vsi *vsi, struct i40e_mac_filter *f)
set_bit(__I40E_MACVLAN_SYNC_PENDING, vsi->back->state);
}
-/**
- * i40e_del_filter - Remove a MAC/VLAN filter from the VSI
- * @vsi: the VSI to be searched
- * @macaddr: the MAC address
- * @vlan: the VLAN
- *
- * NOTE: This function is expected to be called with mac_filter_hash_lock
- * being held.
- * ANOTHER NOTE: This function MUST be called from within the context of
- * the "safe" variants of any list iterators, e.g. list_for_each_entry_safe()
- * instead of list_for_each_entry().
- **/
-void i40e_del_filter(struct i40e_vsi *vsi, const u8 *macaddr, s16 vlan)
-{
- struct i40e_mac_filter *f;
-
- if (!vsi || !macaddr)
- return;
-
- f = i40e_find_filter(vsi, macaddr, vlan);
- __i40e_del_filter(vsi, f);
-}
-
/**
* i40e_add_mac_filter - Add a MAC filter for all active VLANs
* @vsi: the VSI to be searched
--
2.47.1
next prev parent reply other threads:[~2024-12-21 18:43 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-21 18:42 [RFC net-next 0/9] i40e deadcoding linux
2024-12-21 18:42 ` [RFC net-next 1/9] i40e: Deadcode i40e_aq_* linux
2025-01-06 11:43 ` Simon Horman
2024-12-21 18:42 ` [RFC net-next 2/9] i40e: Remove unused i40e_blink_phy_link_led linux
2024-12-23 3:13 ` Kalesh Anakkur Purayil
2024-12-21 18:42 ` [RFC net-next 3/9] i40e: Remove unused i40e_(read|write)_phy_register linux
2025-01-06 11:43 ` Simon Horman
2024-12-21 18:42 ` [RFC net-next 4/9] i40e: Deadcode profile code linux
2025-01-06 11:44 ` Simon Horman
2024-12-21 18:42 ` [RFC net-next 5/9] i40e: Remove unused i40e_get_cur_guaranteed_fd_count linux
2024-12-23 3:11 ` Kalesh Anakkur Purayil
2024-12-21 18:42 ` linux [this message]
2025-01-06 11:44 ` [RFC net-next 6/9] i40e: Remove unused i40e_del_filter Simon Horman
2024-12-21 18:42 ` [RFC net-next 7/9] i40e: Remove unused i40e_commit_partition_bw_setting linux
2024-12-23 3:14 ` Kalesh Anakkur Purayil
2024-12-21 18:42 ` [RFC net-next 8/9] i40e: Remove unused i40e_asq_send_command_v2 linux
2025-01-06 11:45 ` Simon Horman
2024-12-21 18:42 ` [RFC net-next 9/9] i40e: Remove unused i40e_dcb_hw_get_num_tc linux
2024-12-23 3:10 ` Kalesh Anakkur Purayil
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=20241221184247.118752-7-linux@treblig.org \
--to=linux@treblig.org \
--cc=andrew+netdev@lunn.ch \
--cc=anthony.l.nguyen@intel.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=przemyslaw.kitszel@intel.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).