aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.h
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2007-12-20 23:05:44 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:59:29 -0500
commit8d018621085b8d00511768c343d941676bd77ee9 (patch)
tree0649c902e48609a0af8391bcb99cc7ff5080ff97 /drivers/net/tg3.h
parenta43d8994b959a6daeeadcd1be6d4a9045b7029ac (diff)
[TG3]: Separate requested and actual flow control parameters
This patch removes the TX and RX flow control flags from tg3_flags and adds two new flow control variables, flowctrl and active_flowctrl. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Signed-off-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.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index da18fb220712..ac47c176fc03 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2103,13 +2103,18 @@ struct tg3_link_config {
2103 u16 speed; 2103 u16 speed;
2104 u8 duplex; 2104 u8 duplex;
2105 u8 autoneg; 2105 u8 autoneg;
2106 u8 flowctrl;
2107#define TG3_FLOW_CTRL_TX 0x01
2108#define TG3_FLOW_CTRL_RX 0x02
2106 2109
2107 /* Describes what we actually have. */ 2110 /* Describes what we actually have. */
2108 u16 active_speed; 2111 u8 active_flowctrl;
2112
2109 u8 active_duplex; 2113 u8 active_duplex;
2110#define SPEED_INVALID 0xffff 2114#define SPEED_INVALID 0xffff
2111#define DUPLEX_INVALID 0xff 2115#define DUPLEX_INVALID 0xff
2112#define AUTONEG_INVALID 0xff 2116#define AUTONEG_INVALID 0xff
2117 u16 active_speed;
2113 2118
2114 /* When we go in and out of low power mode we need 2119 /* When we go in and out of low power mode we need
2115 * to swap with this state. 2120 * to swap with this state.
@@ -2337,8 +2342,6 @@ struct tg3 {
2337#define TG3_FLAG_EEPROM_WRITE_PROT 0x00001000 2342#define TG3_FLAG_EEPROM_WRITE_PROT 0x00001000
2338#define TG3_FLAG_NVRAM 0x00002000 2343#define TG3_FLAG_NVRAM 0x00002000
2339#define TG3_FLAG_NVRAM_BUFFERED 0x00004000 2344#define TG3_FLAG_NVRAM_BUFFERED 0x00004000
2340#define TG3_FLAG_RX_PAUSE 0x00008000
2341#define TG3_FLAG_TX_PAUSE 0x00010000
2342#define TG3_FLAG_PCIX_MODE 0x00020000 2345#define TG3_FLAG_PCIX_MODE 0x00020000
2343#define TG3_FLAG_PCI_HIGH_SPEED 0x00040000 2346#define TG3_FLAG_PCI_HIGH_SPEED 0x00040000
2344#define TG3_FLAG_PCI_32BIT 0x00080000 2347#define TG3_FLAG_PCI_32BIT 0x00080000