]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
i40e: Use correct shift for VLAN priority
authorRichard Rodriguez <richard.rodriguez@intel.com>
Fri, 26 Oct 2018 21:33:32 +0000 (14:33 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 14 Nov 2018 18:56:33 +0000 (10:56 -0800)
When using port VLAN, for VFs, and setting priority bits, the device
was sending out incorrect priority bits, and also setting the CFI
bit incorrectly.

To fix this, changed shift and mask bit definition for this function, to
use the correct ones.

Signed-off-by: Richard Rodriguez <richard.rodriguez@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h

index bf67d62e2b5fd0b4ddb53a82c8f0a8e9081e1ef5..f9621026beefb0cbef63496c2b93101eed7f1092 100644 (file)
@@ -13,9 +13,9 @@
 #define I40E_DEFAULT_NUM_MDD_EVENTS_ALLOWED    3
 #define I40E_DEFAULT_NUM_INVALID_MSGS_ALLOWED  10
 
-#define I40E_VLAN_PRIORITY_SHIFT       12
+#define I40E_VLAN_PRIORITY_SHIFT       13
 #define I40E_VLAN_MASK                 0xFFF
-#define I40E_PRIORITY_MASK             0x7000
+#define I40E_PRIORITY_MASK             0xE000
 
 /* Various queue ctrls */
 enum i40e_queue_ctrl {