diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-22 14:23:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-22 14:23:43 -0700 |
| commit | bba6ec7e4963e30366359686f34e5bdb00b1a066 (patch) | |
| tree | 05c44b6b99e46d876b144065537dd8673d07b162 /drivers/net/ethernet/intel/igb/e1000_phy.h | |
| parent | 1304a7343b30fc4f16045412efdbb4179a3d9255 (diff) | |
| parent | 8376dad0c877bc691b2feadd3390a162aa3c3bd9 (diff) | |
| download | blackbird-obmc-linux-bba6ec7e4963e30366359686f34e5bdb00b1a066.tar.gz blackbird-obmc-linux-bba6ec7e4963e30366359686f34e5bdb00b1a066.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says:
====================
This series contains updates to ethtool.h, e1000, e1000e, and igb to
implement MDI/MDIx control.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/e1000_phy.h')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_phy.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.h b/drivers/net/ethernet/intel/igb/e1000_phy.h index 34e40619f16b..6ac3299bfcb9 100644 --- a/drivers/net/ethernet/intel/igb/e1000_phy.h +++ b/drivers/net/ethernet/intel/igb/e1000_phy.h @@ -111,8 +111,9 @@ s32 igb_check_polarity_m88(struct e1000_hw *hw); #define I82580_PHY_STATUS2_SPEED_100MBPS 0x0100 /* I82580 PHY Control 2 */ -#define I82580_PHY_CTRL2_AUTO_MDIX 0x0400 -#define I82580_PHY_CTRL2_FORCE_MDI_MDIX 0x0200 +#define I82580_PHY_CTRL2_MANUAL_MDIX 0x0200 +#define I82580_PHY_CTRL2_AUTO_MDI_MDIX 0x0400 +#define I82580_PHY_CTRL2_MDIX_CFG_MASK 0x0600 /* I82580 PHY Diagnostics Status */ #define I82580_DSTATUS_CABLE_LENGTH 0x03FC |
