33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From: Jacob Keller <jacob.e.keller@intel.com>
|
|
Date: Thu, 7 Sep 2017 15:19:12 -0700
|
|
Subject: i40e: fix flags declaration
|
|
Origin: https://git.kernel.org/linus/b48be9978e4b21b28b7349f57574dae21378ddd5
|
|
|
|
Since we don't yet have more than 32 flags, we'll use a u32 for both the
|
|
hw_features and flag field. Should we gain more flags in the future, we
|
|
may need to convert to a u64 or separate flags out into two fields.
|
|
|
|
This was overlooked in the previous commit 2781de2134c4 ("i40e/i40evf:
|
|
organize and re-number feature flags"), where the feature flag was not
|
|
converted form u64 to u32.
|
|
|
|
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
|
|
Reviewed-by: Mitch Williams <mitch.a.williams@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.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/intel/i40e/i40e.h
|
|
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
|
|
@@ -422,7 +422,7 @@ struct i40e_pf {
|
|
#define I40E_HW_PORT_ID_VALID BIT(17)
|
|
#define I40E_HW_RESTART_AUTONEG BIT(18)
|
|
|
|
- u64 flags;
|
|
+ u32 flags;
|
|
#define I40E_FLAG_RX_CSUM_ENABLED BIT(0)
|
|
#define I40E_FLAG_MSI_ENABLED BIT(1)
|
|
#define I40E_FLAG_MSIX_ENABLED BIT(2)
|