OSDN Git Service

(root) / android-x86 / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eb873fe) | patch
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)
commit155b0f690051345deefc653774b739c786067d61
tree5a92ad94954ed84c14cdf2c665d57e7aadc866a7tree | snapshot
parenteb873fe4d31b92c455659bf2c54b203d5d46b9a1commit | diff
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: 43a3d9ba34c9c ("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 diff | blob | history
kernel
About OSDN
Find Software
Develop Software
Help