e1000e: reorganize PHY and flow control interface

This reorganization moves the PHY status into a separate
struct. Flow Control setup is moved into this struct as well
and frame size away from here into the adapter struct where its
inly use is.

The post-link-up code is now a separate function and moved out
of the watchdog function itself. This allows us to track the
es2lan restart issue a bit easier.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
index df2782473910..e3f4aeefeae2 100644
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/e1000e/es2lan.c
@@ -119,7 +119,7 @@ static s32 e1000_init_phy_params_80003es2lan(struct e1000_hw *hw)
         struct e1000_phy_info *phy = &hw->phy;
         s32 ret_val;
 
-        if (hw->media_type != e1000_media_type_copper) {
+        if (hw->phy.media_type != e1000_media_type_copper) {
                 phy->type       = e1000_phy_none;
                 return 0;
         }
@@ -198,10 +198,10 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
         /* Set media type */
         switch (adapter->pdev->device) {
         case E1000_DEV_ID_80003ES2LAN_SERDES_DPT:
-                hw->media_type = e1000_media_type_internal_serdes;
+                hw->phy.media_type = e1000_media_type_internal_serdes;
                 break;
         default:
-                hw->media_type = e1000_media_type_copper;
+                hw->phy.media_type = e1000_media_type_copper;
                 break;
         }
 
@@ -213,7 +213,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
         mac->arc_subsystem_valid = (er32(FWSM) & E1000_FWSM_MODE_MASK) ? 1 : 0;
 
         /* check for link */
-        switch (hw->media_type) {
+        switch (hw->phy.media_type) {
         case e1000_media_type_copper:
                 func->setup_physical_interface = e1000_setup_copper_link_80003es2lan;
                 func->check_for_link = e1000e_check_for_copper_link;
@@ -591,7 +591,7 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
 
         udelay(1);
 
-        if (hw->phy.wait_for_link) {
+        if (hw->phy.autoneg_wait_to_complete) {
                 hw_dbg(hw, "Waiting for forced speed/duplex link "
                          "on GG82563 phy.\n");
 
@@ -682,7 +682,7 @@ static s32 e1000_get_link_up_info_80003es2lan(struct e1000_hw *hw, u16 *speed,
 {
         s32 ret_val;
 
-        if (hw->media_type == e1000_media_type_copper) {
+        if (hw->phy.media_type == e1000_media_type_copper) {
                 ret_val = e1000e_get_speed_and_duplex_copper(hw,
                                                                     speed,
                                                                     duplex);
@@ -854,7 +854,7 @@ static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw)
         /* Transmit Arbitration Control 0 */
         reg = er32(TARC0);
         reg &= ~(0xF << 27); /* 30:27 */
-        if (hw->media_type != e1000_media_type_copper)
+        if (hw->phy.media_type != e1000_media_type_copper)
                 reg &= ~(1 << 20);
         ew32(TARC0, reg);