]> git.baikalelectronics.ru Git - kernel.git/commit
i40evf: fix merge error in older patch
authorJesse Brandeburg <jesse.brandeburg@intel.com>
Fri, 28 Apr 2017 23:53:16 +0000 (16:53 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 31 May 2017 09:58:07 +0000 (02:58 -0700)
commit92414f91098f1f6da71d84b40dacf4bbbdde7c34
tree5a92ad94954ed84c14cdf2c665d57e7aadc866a7
parent3e2bb9334f20fcc03f28093ba22b0ea79be67828
i40evf: fix merge error in older patch

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: 510aa5cfe32c3 ("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>
drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c