diff mbox series

i40e/i40evf: actually use u32 for feature flags

Message ID 20171011140316.3802721-1-arnd@arndb.de
State New
Headers show
Series i40e/i40evf: actually use u32 for feature flags | expand

Commit Message

Arnd Bergmann Oct. 11, 2017, 2:02 p.m. UTC
A previous cleanup intended to change the flags variable to 32
bit instead of 64, but accidentally left out the important
part of that change, leading to a build error:

drivers/net/ethernet/intel/i40e/i40e_ethtool.o: In function `i40e_set_priv_flags':
i40e_ethtool.c:(.text+0x1a94): undefined reference to `wrong_size_cmpxchg'

This adds the missing modification.

Fixes: b74f571f59a8 ("i40e/i40evf: organize and re-number feature flags")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/net/ethernet/intel/i40e/i40e.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.9.0

Comments

Jacob Keller Oct. 11, 2017, 10:21 p.m. UTC | #1
> -----Original Message-----

> From: Arnd Bergmann [mailto:arnd@arndb.de]

> Sent: Wednesday, October 11, 2017 7:03 AM

> To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>

> Cc: Arnd Bergmann <arnd@arndb.de>; Keller, Jacob E

> <jacob.e.keller@intel.com>; Duyck, Alexander H

> <alexander.h.duyck@intel.com>; Williams, Mitch A

> <mitch.a.williams@intel.com>; Sadowski, Filip <filip.sadowski@intel.com>; intel-

> wired-lan@lists.osuosl.org; netdev@vger.kernel.org; linux-

> kernel@vger.kernel.org

> Subject: [PATCH] i40e/i40evf: actually use u32 for feature flags

> 

> A previous cleanup intended to change the flags variable to 32

> bit instead of 64, but accidentally left out the important

> part of that change, leading to a build error:

> 

> drivers/net/ethernet/intel/i40e/i40e_ethtool.o: In function `i40e_set_priv_flags':

> i40e_ethtool.c:(.text+0x1a94): undefined reference to `wrong_size_cmpxchg'

> 

> This adds the missing modification.

> 


Hah good eyes. I'm guessing this got messed up in a patch re-ordering.

Acked-by: Jacob Keller <jacob.e.keller@intel.com>


> Fixes: b74f571f59a8 ("i40e/i40evf: organize and re-number feature flags")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  drivers/net/ethernet/intel/i40e/i40e.h | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/drivers/net/ethernet/intel/i40e/i40e.h

> b/drivers/net/ethernet/intel/i40e/i40e.h

> index 18c453a3e728..7baf6d8a84dd 100644

> --- a/drivers/net/ethernet/intel/i40e/i40e.h

> +++ b/drivers/net/ethernet/intel/i40e/i40e.h

> @@ -424,7 +424,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)

> --

> 2.9.0
Jeff Kirsher Oct. 11, 2017, 10:46 p.m. UTC | #2
On Wed, 2017-10-11 at 16:02 +0200, Arnd Bergmann wrote:
> A previous cleanup intended to change the flags variable to 32

> bit instead of 64, but accidentally left out the important

> part of that change, leading to a build error:

> 

> drivers/net/ethernet/intel/i40e/i40e_ethtool.o: In function

> `i40e_set_priv_flags':

> i40e_ethtool.c:(.text+0x1a94): undefined reference to

> `wrong_size_cmpxchg'

> 

> This adds the missing modification.

> 

> Fixes: b74f571f59a8 ("i40e/i40evf: organize and re-number feature

> flags")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  drivers/net/ethernet/intel/i40e/i40e.h | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)


To slow... :-) I had already sent a fix for this on Monday to David. 
Check David Miller's net-next tree, it is already there.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index 18c453a3e728..7baf6d8a84dd 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -424,7 +424,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)