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, 8 deletions

diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index eed1b449691..e358a773e67 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -298,7 +298,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_adapter *adapter)
         struct e1000_mac_info *mac = &hw->mac;
 
         /* Set media type function pointer */
-        hw->media_type = e1000_media_type_copper;
+        hw->phy.media_type = e1000_media_type_copper;
 
         /* Set mta register count */
         mac->mta_reg_count = 32;
@@ -453,7 +453,7 @@ static s32 e1000_phy_force_speed_duplex_ich8lan(struct e1000_hw *hw)
 
         udelay(1);
 
-        if (phy->wait_for_link) {
+        if (phy->autoneg_wait_to_complete) {
                 hw_dbg(hw, "Waiting for forced speed/duplex link on IFE phy.\n");
 
                 ret_val = e1000e_phy_has_link_generic(hw,
@@ -1852,7 +1852,6 @@ static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw)
  **/
 static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)
 {
-        struct e1000_mac_info *mac = &hw->mac;
         s32 ret_val;
 
         if (e1000_check_reset_block(hw))
@@ -1863,19 +1862,19 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)
          * the default flow control setting, so we explicitly
          * set it to full.
          */
-        if (mac->fc == e1000_fc_default)
-                mac->fc = e1000_fc_full;
+        if (hw->fc.type == e1000_fc_default)
+                hw->fc.type = e1000_fc_full;
 
-        mac->original_fc = mac->fc;
+        hw->fc.original_type = hw->fc.type;
 
-        hw_dbg(hw, "After fix-ups FlowControl is now = %x\n", mac->fc);
+        hw_dbg(hw, "After fix-ups FlowControl is now = %x\n", hw->fc.type);
 
         /* Continue to configure the copper link. */
         ret_val = e1000_setup_copper_link_ich8lan(hw);
         if (ret_val)
                 return ret_val;
 
-        ew32(FCTTV, mac->fc_pause_time);
+        ew32(FCTTV, hw->fc.pause_time);
 
         return e1000e_set_fc_watermarks(hw);
 }