Commit 3ac7598a authored Apr 28, 2017 by Jesse Brandeburg Committed by Greg Kroah-Hartman Apr 13, 2018

i40evf: fix merge error in older patch




[ Upstream commit 155b0f690051345deefc653774b739c786067d61 ]

This patch fixes a missing line that was missed while merging,
which results in a driver feature in the VF not working to
enable RSS as a negotiated feature.

Fixes: 43a3d9ba ("i40evf: Allow PF driver to configure RSS")
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 2c90ca5c

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@ int i40evf_send_vf_config_msg(struct i40evf_adapter *adapter)
		adapter->current_op = I40E_VIRTCHNL_OP_GET_VF_RESOURCES;
		adapter->aq_required &= ~I40EVF_FLAG_AQ_GET_CONFIG;
		caps = I40E_VIRTCHNL_VF_OFFLOAD_L2 \|
		I40E_VIRTCHNL_VF_OFFLOAD_RSS_PF \|
		I40E_VIRTCHNL_VF_OFFLOAD_RSS_AQ \|
		I40E_VIRTCHNL_VF_OFFLOAD_RSS_REG \|
		I40E_VIRTCHNL_VF_OFFLOAD_VLAN \|