diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2009-11-13 08:03:36 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-16 01:14:39 -0500 |
commit | f66a29b03a2637ff052f2b8a81a5417fa44e228b (patch) | |
tree | b0cef7e1be9fe0e44c90ad95039ef5d9122ce5fc /drivers/net/tg3.h | |
parent | 24f4efd4e6c89a4093d0b8653d6669e45de45001 (diff) |
tg3: Move TG3_FLG2_PROTECTED_NVRAM to tg3_flags3
We need room for another TSO flag and it would be most efficient if it
resided in tg3_flags2. This patch moves the TG3_FLG2_PROTECTED_NVRAM
to tg3_flags3 to make room.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.h')
-rw-r--r-- | drivers/net/tg3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index e0a8b611fc2f..590a692d6a95 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
@@ -2753,7 +2753,6 @@ struct tg3 { | |||
2753 | #define TG3_FLG2_SERDES_PREEMPHASIS 0x00020000 | 2753 | #define TG3_FLG2_SERDES_PREEMPHASIS 0x00020000 |
2754 | #define TG3_FLG2_5705_PLUS 0x00040000 | 2754 | #define TG3_FLG2_5705_PLUS 0x00040000 |
2755 | #define TG3_FLG2_5750_PLUS 0x00080000 | 2755 | #define TG3_FLG2_5750_PLUS 0x00080000 |
2756 | #define TG3_FLG2_PROTECTED_NVRAM 0x00100000 | ||
2757 | #define TG3_FLG2_USING_MSI 0x00200000 | 2756 | #define TG3_FLG2_USING_MSI 0x00200000 |
2758 | #define TG3_FLG2_USING_MSIX 0x00400000 | 2757 | #define TG3_FLG2_USING_MSIX 0x00400000 |
2759 | #define TG3_FLG2_USING_MSI_OR_MSIX (TG3_FLG2_USING_MSI | \ | 2758 | #define TG3_FLG2_USING_MSI_OR_MSIX (TG3_FLG2_USING_MSI | \ |
@@ -2773,6 +2772,7 @@ struct tg3 { | |||
2773 | u32 tg3_flags3; | 2772 | u32 tg3_flags3; |
2774 | #define TG3_FLG3_NO_NVRAM_ADDR_TRANS 0x00000001 | 2773 | #define TG3_FLG3_NO_NVRAM_ADDR_TRANS 0x00000001 |
2775 | #define TG3_FLG3_ENABLE_APE 0x00000002 | 2774 | #define TG3_FLG3_ENABLE_APE 0x00000002 |
2775 | #define TG3_FLG3_PROTECTED_NVRAM 0x00000004 | ||
2776 | #define TG3_FLG3_5701_DMA_BUG 0x00000008 | 2776 | #define TG3_FLG3_5701_DMA_BUG 0x00000008 |
2777 | #define TG3_FLG3_USE_PHYLIB 0x00000010 | 2777 | #define TG3_FLG3_USE_PHYLIB 0x00000010 |
2778 | #define TG3_FLG3_MDIOBUS_INITED 0x00000020 | 2778 | #define TG3_FLG3_MDIOBUS_INITED 0x00000020 |