diff options
| author | Tom Rini <trini@ti.com> | 2013-06-24 22:27:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-06-24 22:27:44 -0400 |
| commit | ca85eb8c4271509aaac1ccb26ae3eb1a7827b4e6 (patch) | |
| tree | 1532b13194c3d7daa8f1f10f3263fb806911cd67 /include/linux | |
| parent | 4e78e0317d3aab42c381b01033a0cd869ea28979 (diff) | |
| parent | 433a2c5325b982b49b099e526d373d07d0cc5e97 (diff) | |
| download | olio-uboot-2014.01-ca85eb8c4271509aaac1ccb26ae3eb1a7827b4e6.tar.xz olio-uboot-2014.01-ca85eb8c4271509aaac1ccb26ae3eb1a7827b4e6.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ethtool.h | 4 | ||||
| -rw-r--r-- | include/linux/mii.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index fcb20fe10..f6dbdb096 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -580,6 +580,8 @@ enum ethtool_sfeatures_retval_bits { #define SUPPORTED_10000baseKX4_Full (1 << 18) #define SUPPORTED_10000baseKR_Full (1 << 19) #define SUPPORTED_10000baseR_FEC (1 << 20) +#define SUPPORTED_1000baseX_Half (1 << 21) +#define SUPPORTED_1000baseX_Full (1 << 22) /* Indicates what features are advertised by the interface. */ #define ADVERTISED_10baseT_Half (1 << 0) @@ -603,6 +605,8 @@ enum ethtool_sfeatures_retval_bits { #define ADVERTISED_10000baseKX4_Full (1 << 18) #define ADVERTISED_10000baseKR_Full (1 << 19) #define ADVERTISED_10000baseR_FEC (1 << 20) +#define ADVERTISED_1000baseX_Half (1 << 21) +#define ADVERTISED_1000baseX_Full (1 << 22) /* The following are all involved in forcing a particular link * mode for the device for setting things. When getting the diff --git a/include/linux/mii.h b/include/linux/mii.h index 8b9269214..66b83d83d 100644 --- a/include/linux/mii.h +++ b/include/linux/mii.h @@ -115,6 +115,8 @@ #define EXPANSION_MFAULTS 0x0010 /* Multiple faults detected */ #define EXPANSION_RESV 0xffe0 /* Unused... */ +#define ESTATUS_1000_XFULL 0x8000 /* Can do 1000BX Full */ +#define ESTATUS_1000_XHALF 0x4000 /* Can do 1000BX Half */ #define ESTATUS_1000_TFULL 0x2000 /* Can do 1000BT Full */ #define ESTATUS_1000_THALF 0x1000 /* Can do 1000BT Half */ |