diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2008-03-28 12:15:16 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2008-03-28 22:15:00 -0400 |
commit | 318a94d68979cbe9cc98a3050b4b7be2f08513c8 (patch) | |
tree | 32fdd0bd9f4a0c9dcc2a958b18820286a9acdcec /drivers/net/e1000e/82571.c | |
parent | e2de3eb69c40c01739ce9b154c65e51d94d72966 (diff) |
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>
Diffstat (limited to 'drivers/net/e1000e/82571.c')
-rw-r--r-- | drivers/net/e1000e/82571.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c index f5a4d40000cd..f7e1619b974e 100644 --- a/drivers/net/e1000e/82571.c +++ b/drivers/net/e1000e/82571.c | |||
@@ -75,7 +75,7 @@ static s32 e1000_init_phy_params_82571(struct e1000_hw *hw) | |||
75 | struct e1000_phy_info *phy = &hw->phy; | 75 | struct e1000_phy_info *phy = &hw->phy; |
76 | s32 ret_val; | 76 | s32 ret_val; |
77 | 77 | ||
78 | if (hw->media_type != e1000_media_type_copper) { | 78 | if (hw->phy.media_type != e1000_media_type_copper) { |
79 | phy->type = e1000_phy_none; | 79 | phy->type = e1000_phy_none; |
80 | return 0; | 80 | return 0; |
81 | } | 81 | } |
@@ -195,16 +195,16 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter) | |||
195 | case E1000_DEV_ID_82571EB_FIBER: | 195 | case E1000_DEV_ID_82571EB_FIBER: |
196 | case E1000_DEV_ID_82572EI_FIBER: | 196 | case E1000_DEV_ID_82572EI_FIBER: |
197 | case E1000_DEV_ID_82571EB_QUAD_FIBER: | 197 | case E1000_DEV_ID_82571EB_QUAD_FIBER: |
198 | hw->media_type = e1000_media_type_fiber; | 198 | hw->phy.media_type = e1000_media_type_fiber; |
199 | break; | 199 | break; |
200 | case E1000_DEV_ID_82571EB_SERDES: | 200 | case E1000_DEV_ID_82571EB_SERDES: |
201 | case E1000_DEV_ID_82572EI_SERDES: | 201 | case E1000_DEV_ID_82572EI_SERDES: |
202 | case E1000_DEV_ID_82571EB_SERDES_DUAL: | 202 | case E1000_DEV_ID_82571EB_SERDES_DUAL: |
203 | case E1000_DEV_ID_82571EB_SERDES_QUAD: | 203 | case E1000_DEV_ID_82571EB_SERDES_QUAD: |
204 | hw->media_type = e1000_media_type_internal_serdes; | 204 | hw->phy.media_type = e1000_media_type_internal_serdes; |
205 | break; | 205 | break; |
206 | default: | 206 | default: |
207 | hw->media_type = e1000_media_type_copper; | 207 | hw->phy.media_type = e1000_media_type_copper; |
208 | break; | 208 | break; |
209 | } | 209 | } |
210 | 210 | ||
@@ -216,7 +216,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter) | |||
216 | mac->arc_subsystem_valid = (er32(FWSM) & E1000_FWSM_MODE_MASK) ? 1 : 0; | 216 | mac->arc_subsystem_valid = (er32(FWSM) & E1000_FWSM_MODE_MASK) ? 1 : 0; |
217 | 217 | ||
218 | /* check for link */ | 218 | /* check for link */ |
219 | switch (hw->media_type) { | 219 | switch (hw->phy.media_type) { |
220 | case e1000_media_type_copper: | 220 | case e1000_media_type_copper: |
221 | func->setup_physical_interface = e1000_setup_copper_link_82571; | 221 | func->setup_physical_interface = e1000_setup_copper_link_82571; |
222 | func->check_for_link = e1000e_check_for_copper_link; | 222 | func->check_for_link = e1000e_check_for_copper_link; |
@@ -1015,7 +1015,7 @@ static s32 e1000_setup_link_82571(struct e1000_hw *hw) | |||
1015 | * set it to full. | 1015 | * set it to full. |
1016 | */ | 1016 | */ |
1017 | if (hw->mac.type == e1000_82573) | 1017 | if (hw->mac.type == e1000_82573) |
1018 | hw->mac.fc = e1000_fc_full; | 1018 | hw->fc.type = e1000_fc_full; |
1019 | 1019 | ||
1020 | return e1000e_setup_link(hw); | 1020 | return e1000e_setup_link(hw); |
1021 | } | 1021 | } |