diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 11:04:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 11:04:01 -0500 |
| commit | 8cde0776ec1e86c270f65bf482f96288e6bf0023 (patch) | |
| tree | 6350a8d67bea7bcdcbd1705a54f1b8e409a28775 /include/linux/ethtool.h | |
| parent | 2ed5e6d09e266bd2288d49aaaf240ed8c468c13c (diff) | |
| parent | b78612b796b0d6cdfba553d456eff008278830e3 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
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. */ |