diff options
author | françois romieu <romieu@fr.zoreil.com> | 2010-10-13 05:26:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-16 14:13:23 -0400 |
commit | 15419227f773b6c1b5fae44bde876078a9204caa (patch) | |
tree | 0e0c50fee62dfbc7934bf389367aae87e6fd626c /drivers/net/via-velocity.h | |
parent | 10da66f7552b3c7966c2f4f1f72009fb0b5539ec (diff) |
via-velocity: forced 1000 Mbps mode support.
Full duplex only. Half duplex 1000 Mbps is not supported.
Signed-off-by: David Lv <DavidLv@viatech.com.cn>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Tested-by: Seguier Regis <rseguier@e-teleport.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/via-velocity.h')
-rw-r--r-- | drivers/net/via-velocity.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h index b5e120b0074b..aa2e69b9ff61 100644 --- a/drivers/net/via-velocity.h +++ b/drivers/net/via-velocity.h | |||
@@ -848,7 +848,7 @@ enum velocity_owner { | |||
848 | * Bits in CHIPGCR register | 848 | * Bits in CHIPGCR register |
849 | */ | 849 | */ |
850 | 850 | ||
851 | #define CHIPGCR_FCGMII 0x80 | 851 | #define CHIPGCR_FCGMII 0x80 /* enable GMII mode */ |
852 | #define CHIPGCR_FCFDX 0x40 | 852 | #define CHIPGCR_FCFDX 0x40 |
853 | #define CHIPGCR_FCRESV 0x20 | 853 | #define CHIPGCR_FCRESV 0x20 |
854 | #define CHIPGCR_FCMODE 0x10 | 854 | #define CHIPGCR_FCMODE 0x10 |
@@ -1390,7 +1390,8 @@ enum speed_opt { | |||
1390 | SPD_DPX_100_HALF = 1, | 1390 | SPD_DPX_100_HALF = 1, |
1391 | SPD_DPX_100_FULL = 2, | 1391 | SPD_DPX_100_FULL = 2, |
1392 | SPD_DPX_10_HALF = 3, | 1392 | SPD_DPX_10_HALF = 3, |
1393 | SPD_DPX_10_FULL = 4 | 1393 | SPD_DPX_10_FULL = 4, |
1394 | SPD_DPX_1000_FULL = 5 | ||
1394 | }; | 1395 | }; |
1395 | 1396 | ||
1396 | enum velocity_init_type { | 1397 | enum velocity_init_type { |