2 files changed, 12 insertions, 22 deletions

diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c
index 11dcda0f453e..ff67a84e6802 100644
--- a/drivers/net/ixgb/ixgb_hw.c
+++ b/drivers/net/ixgb/ixgb_hw.c
@@ -192,7 +192,7 @@ ixgb_identify_xpak_vendor(struct ixgb_hw *hw)
                 vendor_name[i] = ixgb_read_phy_reg(hw,
                                                    MDIO_PMA_PMD_XPAK_VENDOR_NAME
                                                    + i, IXGB_PHY_ADDRESS,
-                                                   MDIO_PMA_PMD_DID);
+                                                   MDIO_MMD_PMAPMD);
         }
 
         /* Determine the actual vendor */
@@ -1225,15 +1225,15 @@ ixgb_optics_reset(struct ixgb_hw *hw)
                 u16 mdio_reg;
 
                 ixgb_write_phy_reg(hw,
-                                        MDIO_PMA_PMD_CR1,
-                                        IXGB_PHY_ADDRESS,
-                                        MDIO_PMA_PMD_DID,
-                                        MDIO_PMA_PMD_CR1_RESET);
-
-                mdio_reg = ixgb_read_phy_reg( hw,
-                                                MDIO_PMA_PMD_CR1,
-                                                IXGB_PHY_ADDRESS,
-                                                MDIO_PMA_PMD_DID);
+                                   MDIO_CTRL1,
+                                   IXGB_PHY_ADDRESS,
+                                   MDIO_MMD_PMAPMD,
+                                   MDIO_CTRL1_RESET);
+
+                mdio_reg = ixgb_read_phy_reg(hw,
+                                             MDIO_CTRL1,
+                                             IXGB_PHY_ADDRESS,
+                                             MDIO_MMD_PMAPMD);
         }
 
         return;
diff --git a/drivers/net/ixgb/ixgb_hw.h b/drivers/net/ixgb/ixgb_hw.h
index 831fe0c58b2b..af6ca3aab5ad 100644
--- a/drivers/net/ixgb/ixgb_hw.h
+++ b/drivers/net/ixgb/ixgb_hw.h
@@ -29,6 +29,8 @@
 #ifndef _IXGB_HW_H_
 #define _IXGB_HW_H_
 
+#include <linux/mdio.h>
+
 #include "ixgb_osdep.h"
 
 /* Enums */
@@ -507,18 +509,6 @@ typedef enum {
 /* Definitions for the optics devices on the MDIO bus. */
 #define IXGB_PHY_ADDRESS             0x0        /* Single PHY, multiple "Devices" */
 
-/* Standard five-bit Device IDs.  See IEEE 802.3ae, clause 45 */
-#define MDIO_PMA_PMD_DID        0x01
-#define MDIO_WIS_DID            0x02
-#define MDIO_PCS_DID            0x03
-#define MDIO_XGXS_DID           0x04
-
-/* Standard PMA/PMD registers and bit definitions. */
-/* Note: This is a very limited set of definitions,      */
-/* only implemented features are defined.                */
-#define MDIO_PMA_PMD_CR1        0x0000
-#define MDIO_PMA_PMD_CR1_RESET  0x8000
-
 #define MDIO_PMA_PMD_XPAK_VENDOR_NAME       0x803A      /* XPAK/XENPAK devices only */
 
 /* Vendor-specific MDIO registers */