]> www.infradead.org Git - users/jedix/linux-maple.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)
committerJack Vogel <jack.vogel@oracle.com>
Tue, 10 Oct 2017 21:15:23 +0000 (14:15 -0700)
commitc96523fbaf31c2c0cdd020e2fb24291e6dca0737
tree08527b02a367646f0503f0e92881773e14737797
parentc4eb9aeb6ea337e9e201c9d5d6b4d0a9738ed3bf
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>
Orabug: 26785018
(cherry picked from commit 155b0f690051345deefc653774b739c786067d61)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
Reviewed-by: Kyle Fortin <kyle.fortin@oracle.com>
drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c