Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17652c63 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

i40e: remove unused argument 



With the final edition of the patches to remove sleeps from
the driver's entry points, the grab_rtnl argument is no
longer needed, so partially revert the commit that added it.

Change-ID: Ib9778476242586cc9e58b670f5f48d415cb59003
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 0e4425ed

drivers/net/ethernet/intel/i40e/i40e.h

+1 −1
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi, 
					bool is_vf, bool is_netdev);

void i40e_del_filter(struct i40e_vsi *vsi, u8 *macaddr, s16 vlan,

		     bool is_vf, bool is_netdev);

int i40e_sync_vsi_filters(struct i40e_vsi *vsi, bool grab_rtnl);

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

int i40e_vsi_release(struct i40e_vsi *vsi);

drivers/net/ethernet/intel/i40e/i40e_debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp, 
		spin_lock_bh(&vsi->mac_filter_list_lock);

		f = i40e_add_filter(vsi, ma, vlan, false, false);

		spin_unlock_bh(&vsi->mac_filter_list_lock);

		ret = i40e_sync_vsi_filters(vsi, true);

		ret = i40e_sync_vsi_filters(vsi);

		if (f && !ret)

			dev_info(&pf->pdev->dev,

				 "add macaddr: %pM vlan=%d added to VSI %d\n",
@@ -1177,7 +1177,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp, 
		spin_lock_bh(&vsi->mac_filter_list_lock);

		i40e_del_filter(vsi, ma, vlan, false, false);

		spin_unlock_bh(&vsi->mac_filter_list_lock);

		ret = i40e_sync_vsi_filters(vsi, true);

		ret = i40e_sync_vsi_filters(vsi);

		if (!ret)

			dev_info(&pf->pdev->dev,

				 "del macaddr: %pM vlan=%d removed from VSI %d\n",

drivers/net/ethernet/intel/i40e/i40e_main.c

+11 −5
Original line number Diff line number Diff line
@@ -1859,13 +1859,12 @@ static void i40e_cleanup_add_list(struct list_head *add_list) 
/**

 * i40e_sync_vsi_filters - Update the VSI filter list to the HW

 * @vsi: ptr to the VSI

 * @grab_rtnl: whether RTNL needs to be grabbed

 *

 * Push any outstanding VSI filter changes through the AdminQ.

 *

 * Returns 0 or error value

 **/

int i40e_sync_vsi_filters(struct i40e_vsi *vsi, bool grab_rtnl)

int i40e_sync_vsi_filters(struct i40e_vsi *vsi)

{

	struct list_head tmp_del_list, tmp_add_list;

	struct i40e_mac_filter *f, *ftmp, *fclone;
@@ -2169,8 +2168,15 @@ static void i40e_sync_filters_subtask(struct i40e_pf *pf) 


	for (v = 0; v < pf->num_alloc_vsi; v++) {

		if (pf->vsi[v] &&

		    (pf->vsi[v]->flags & I40E_VSI_FLAG_FILTER_CHANGED))

			i40e_sync_vsi_filters(pf->vsi[v], true);

		    (pf->vsi[v]->flags & I40E_VSI_FLAG_FILTER_CHANGED)) {

			int ret = i40e_sync_vsi_filters(pf->vsi[v]);



			if (ret) {

				/* come back and try again later */

				pf->flags |= I40E_FLAG_FILTER_SYNC;

				break;

			}

		}

	}

}
@@ -9219,7 +9225,7 @@ int i40e_vsi_release(struct i40e_vsi *vsi) 
				f->is_vf, f->is_netdev);

	spin_unlock_bh(&vsi->mac_filter_list_lock);



	i40e_sync_vsi_filters(vsi, false);

	i40e_sync_vsi_filters(vsi);



	i40e_vsi_delete(vsi);

	i40e_vsi_free_q_vectors(vsi);

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

+4 −4
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ static int i40e_alloc_vsi_res(struct i40e_vf *vf, enum i40e_vsi_type type) 
	}



	/* program mac filter */

	ret = i40e_sync_vsi_filters(vsi, false);

	ret = i40e_sync_vsi_filters(vsi);

	if (ret)

		dev_err(&pf->pdev->dev, "Unable to program ucast filters\n");
@@ -1633,7 +1633,7 @@ static int i40e_vc_add_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen) 
	spin_unlock_bh(&vsi->mac_filter_list_lock);



	/* program the updated filter list */

	if (i40e_sync_vsi_filters(vsi, false))

	if (i40e_sync_vsi_filters(vsi))

		dev_err(&pf->pdev->dev, "Unable to program VF %d MAC filters\n",

			vf->vf_id);
@@ -1687,7 +1687,7 @@ static int i40e_vc_del_mac_addr_msg(struct i40e_vf *vf, u8 *msg, u16 msglen) 
	spin_unlock_bh(&vsi->mac_filter_list_lock);



	/* program the updated filter list */

	if (i40e_sync_vsi_filters(vsi, false))

	if (i40e_sync_vsi_filters(vsi))

		dev_err(&pf->pdev->dev, "Unable to program VF %d MAC filters\n",

			vf->vf_id);
@@ -2102,7 +2102,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) 


	dev_info(&pf->pdev->dev, "Setting MAC %pM on VF %d\n", mac, vf_id);

	/* program mac filter */

	if (i40e_sync_vsi_filters(vsi, false)) {

	if (i40e_sync_vsi_filters(vsi)) {

		dev_err(&pf->pdev->dev, "Unable to program ucast filters\n");

		ret = -EIO;

		goto error_param;