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

Commit 8ed995ff authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher
Browse files

i40evf: use capabilities flags properly 



Use the capabilities passed to us by the PF driver to control VF driver
behavior. In the process, clean up the VLAN add/remove code so it's not
a horrible morass of ifdefs.

Change-ID: I1050eaf12b658a26fea6813047c9964163c70a73
Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a5fdaf34

drivers/net/ethernet/intel/i40evf/i40evf_main.c

+7 −2
Original line number Diff line number Diff line
@@ -730,6 +730,8 @@ static int i40evf_vlan_rx_add_vid(struct net_device *netdev, 
{

	struct i40evf_adapter *adapter = netdev_priv(netdev);



	if (!VLAN_ALLOWED(adapter))

		return -EIO;

	if (i40evf_add_vlan(adapter, vid) == NULL)

		return -ENOMEM;

	return 0;
@@ -745,9 +747,12 @@ static int i40evf_vlan_rx_kill_vid(struct net_device *netdev, 
{

	struct i40evf_adapter *adapter = netdev_priv(netdev);



	if (VLAN_ALLOWED(adapter)) {

		i40evf_del_vlan(adapter, vid);

		return 0;

	}

	return -EIO;

}



/**

 * i40evf_find_filter - Search filter list for specific mac filter