diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 |
| commit | 2f67bdb23d74a6c6fd4f98f64239c5c34d1833cc (patch) | |
| tree | fe533abe3e7c400848647b95e4806f5125c654c3 /include/linux/ethtool.h | |
| parent | d40d9d29c020f8466c96f8e3ad4b7c014ff1085d (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/ethtool.h')
| -rw-r--r-- | include/linux/ethtool.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index d2c390eff1b2..93535f093216 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h | |||
| @@ -453,10 +453,11 @@ struct ethtool_ops { | |||
| 453 | * it was foced up into this mode or autonegotiated. | 453 | * it was foced up into this mode or autonegotiated. |
| 454 | */ | 454 | */ |
| 455 | 455 | ||
| 456 | /* The forced speed, 10Mb, 100Mb, gigabit, 10GbE. */ | 456 | /* The forced speed, 10Mb, 100Mb, gigabit, 2.5Gb, 10GbE. */ |
| 457 | #define SPEED_10 10 | 457 | #define SPEED_10 10 |
| 458 | #define SPEED_100 100 | 458 | #define SPEED_100 100 |
| 459 | #define SPEED_1000 1000 | 459 | #define SPEED_1000 1000 |
| 460 | #define SPEED_2500 2500 | ||
| 460 | #define SPEED_10000 10000 | 461 | #define SPEED_10000 10000 |
| 461 | 462 | ||
| 462 | /* Duplex, half or full. */ | 463 | /* Duplex, half or full. */ |