diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2009-08-28 15:58:24 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-30 00:42:41 +0200 |
commit | 8f666b07ac53eeedd6c035adf6d4299f9ed0df2d (patch) | |
tree | a7c1b24da09573873097c33a25d25af2ea9206bc /drivers/net/tg3.h | |
parent | tg3: Break out mini producer ring handling (diff) | |
download | linux-8f666b07ac53eeedd6c035adf6d4299f9ed0df2d.tar.xz linux-8f666b07ac53eeedd6c035adf6d4299f9ed0df2d.zip |
tg3: Move the JUMBO_CAPABLE and SUPPORT_MSI flags
This patch moves where the jumbo capable and msi support flags are
located. This is prep work for the addition of msix support flags.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r-- | drivers/net/tg3.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 1c9495df67ce..5efae2c51388 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h @@ -2601,6 +2601,7 @@ struct tg3 { #define TG3_FLAG_EEPROM_WRITE_PROT 0x00001000 #define TG3_FLAG_NVRAM 0x00002000 #define TG3_FLAG_NVRAM_BUFFERED 0x00004000 +#define TG3_FLAG_SUPPORT_MSI 0x00008000 #define TG3_FLAG_PCIX_MODE 0x00020000 #define TG3_FLAG_PCI_HIGH_SPEED 0x00040000 #define TG3_FLAG_PCI_32BIT 0x00080000 @@ -2613,7 +2614,7 @@ struct tg3 { #define TG3_FLAG_CPMU_PRESENT 0x04000000 #define TG3_FLAG_40BIT_DMA_BUG 0x08000000 #define TG3_FLAG_BROKEN_CHECKSUMS 0x10000000 -#define TG3_FLAG_SUPPORT_MSI 0x20000000 +#define TG3_FLAG_JUMBO_CAPABLE 0x20000000 #define TG3_FLAG_CHIP_RESETTING 0x40000000 #define TG3_FLAG_INIT_COMPLETE 0x80000000 u32 tg3_flags2; @@ -2639,7 +2640,6 @@ struct tg3 { #define TG3_FLG2_5750_PLUS 0x00080000 #define TG3_FLG2_PROTECTED_NVRAM 0x00100000 #define TG3_FLG2_USING_MSI 0x00200000 -#define TG3_FLG2_JUMBO_CAPABLE 0x00400000 #define TG3_FLG2_MII_SERDES 0x00800000 #define TG3_FLG2_ANY_SERDES (TG3_FLG2_PHY_SERDES | \ TG3_FLG2_MII_SERDES) |