Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ixgbe: Cleanup holes in flags after removing several of them

This change is just meant to defragment the flags as there are several hole
that have been introduced since several features, or the flags for them,
have been removed.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

authored by

Alexander Duyck and committed by
Jeff Kirsher
a16a0d2f fbe7ca7f

+25 -25
+25 -25
drivers/net/ethernet/intel/ixgbe/ixgbe.h
··· 433 433 * thus the additional *_CAPABLE flags. 434 434 */ 435 435 u32 flags; 436 - #define IXGBE_FLAG_MSI_CAPABLE (u32)(1 << 1) 437 - #define IXGBE_FLAG_MSI_ENABLED (u32)(1 << 2) 438 - #define IXGBE_FLAG_MSIX_CAPABLE (u32)(1 << 3) 439 - #define IXGBE_FLAG_MSIX_ENABLED (u32)(1 << 4) 440 - #define IXGBE_FLAG_RX_1BUF_CAPABLE (u32)(1 << 6) 441 - #define IXGBE_FLAG_RX_PS_CAPABLE (u32)(1 << 7) 442 - #define IXGBE_FLAG_RX_PS_ENABLED (u32)(1 << 8) 443 - #define IXGBE_FLAG_IN_NETPOLL (u32)(1 << 9) 444 - #define IXGBE_FLAG_DCA_ENABLED (u32)(1 << 10) 445 - #define IXGBE_FLAG_DCA_CAPABLE (u32)(1 << 11) 446 - #define IXGBE_FLAG_IMIR_ENABLED (u32)(1 << 12) 447 - #define IXGBE_FLAG_MQ_CAPABLE (u32)(1 << 13) 448 - #define IXGBE_FLAG_DCB_ENABLED (u32)(1 << 14) 449 - #define IXGBE_FLAG_VMDQ_CAPABLE (u32)(1 << 18) 450 - #define IXGBE_FLAG_VMDQ_ENABLED (u32)(1 << 19) 451 - #define IXGBE_FLAG_FAN_FAIL_CAPABLE (u32)(1 << 20) 452 - #define IXGBE_FLAG_NEED_LINK_UPDATE (u32)(1 << 22) 453 - #define IXGBE_FLAG_NEED_LINK_CONFIG (u32)(1 << 23) 454 - #define IXGBE_FLAG_FDIR_HASH_CAPABLE (u32)(1 << 24) 455 - #define IXGBE_FLAG_FDIR_PERFECT_CAPABLE (u32)(1 << 25) 456 - #define IXGBE_FLAG_FCOE_CAPABLE (u32)(1 << 26) 457 - #define IXGBE_FLAG_FCOE_ENABLED (u32)(1 << 27) 458 - #define IXGBE_FLAG_SRIOV_CAPABLE (u32)(1 << 28) 459 - #define IXGBE_FLAG_SRIOV_ENABLED (u32)(1 << 29) 436 + #define IXGBE_FLAG_MSI_CAPABLE (u32)(1 << 0) 437 + #define IXGBE_FLAG_MSI_ENABLED (u32)(1 << 1) 438 + #define IXGBE_FLAG_MSIX_CAPABLE (u32)(1 << 2) 439 + #define IXGBE_FLAG_MSIX_ENABLED (u32)(1 << 3) 440 + #define IXGBE_FLAG_RX_1BUF_CAPABLE (u32)(1 << 4) 441 + #define IXGBE_FLAG_RX_PS_CAPABLE (u32)(1 << 5) 442 + #define IXGBE_FLAG_RX_PS_ENABLED (u32)(1 << 6) 443 + #define IXGBE_FLAG_IN_NETPOLL (u32)(1 << 7) 444 + #define IXGBE_FLAG_DCA_ENABLED (u32)(1 << 8) 445 + #define IXGBE_FLAG_DCA_CAPABLE (u32)(1 << 9) 446 + #define IXGBE_FLAG_IMIR_ENABLED (u32)(1 << 10) 447 + #define IXGBE_FLAG_MQ_CAPABLE (u32)(1 << 11) 448 + #define IXGBE_FLAG_DCB_ENABLED (u32)(1 << 12) 449 + #define IXGBE_FLAG_VMDQ_CAPABLE (u32)(1 << 13) 450 + #define IXGBE_FLAG_VMDQ_ENABLED (u32)(1 << 14) 451 + #define IXGBE_FLAG_FAN_FAIL_CAPABLE (u32)(1 << 15) 452 + #define IXGBE_FLAG_NEED_LINK_UPDATE (u32)(1 << 16) 453 + #define IXGBE_FLAG_NEED_LINK_CONFIG (u32)(1 << 17) 454 + #define IXGBE_FLAG_FDIR_HASH_CAPABLE (u32)(1 << 18) 455 + #define IXGBE_FLAG_FDIR_PERFECT_CAPABLE (u32)(1 << 19) 456 + #define IXGBE_FLAG_FCOE_CAPABLE (u32)(1 << 20) 457 + #define IXGBE_FLAG_FCOE_ENABLED (u32)(1 << 21) 458 + #define IXGBE_FLAG_SRIOV_CAPABLE (u32)(1 << 22) 459 + #define IXGBE_FLAG_SRIOV_ENABLED (u32)(1 << 23) 460 460 461 461 u32 flags2; 462 - #define IXGBE_FLAG2_RSC_CAPABLE (u32)(1) 462 + #define IXGBE_FLAG2_RSC_CAPABLE (u32)(1 << 0) 463 463 #define IXGBE_FLAG2_RSC_ENABLED (u32)(1 << 1) 464 464 #define IXGBE_FLAG2_TEMP_SENSOR_CAPABLE (u32)(1 << 2) 465 465 #define IXGBE_FLAG2_TEMP_SENSOR_EVENT (u32)(1 << 3)