Commit 8a4a126f authored by Nicholas Nunley's avatar Nicholas Nunley Committed by Tony Nguyen
Browse files

iavf: check for null in iavf_fix_features 



If the driver has lost contact with the PF then it enters a disabled state
and frees adapter->vf_res. However, ndo_fix_features can still be called on
the interface, so we need to check for this condition first. Since we have
no information on the features at this time simply leave them unmodified
and return.

Fixes: c4445aed ("i40evf: Fix VLAN features")
Signed-off-by: default avatarNicholas Nunley <nicholas.d.nunley@intel.com>
Tested-by: default avatarTony Brelinski <tony.brelinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 4e5e6b5d

drivers/net/ethernet/intel/iavf/iavf_main.c

+2 −1
Original line number Diff line number Diff line
@@ -3503,7 +3503,8 @@ static netdev_features_t iavf_fix_features(struct net_device *netdev, 
{

	struct iavf_adapter *adapter = netdev_priv(netdev);



	if (!(adapter->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_VLAN))

	if (adapter->vf_res &&

	    !(adapter->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_VLAN))

		features &= ~(NETIF_F_HW_VLAN_CTAG_TX |

			      NETIF_F_HW_VLAN_CTAG_RX |

			      NETIF_F_HW_VLAN_CTAG_FILTER);