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: Mitch Williams <mitch.a.williams@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>hifive-unleashed-5.1
parent
a5fdaf342a
commit
8ed995ff6b
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue