diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2009-07-23 20:07:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-26 18:46:41 +0200 |
| commit | dcc3ae9a5252ea4ffe65b43cdc09ec2654b48000 (patch) | |
| tree | 7c3c1c480e8ce395c2b3b5b78802f97e28b60b80 /drivers/net/igb/e1000_82575.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| download | linux-dcc3ae9a5252ea4ffe65b43cdc09ec2654b48000.tar.xz linux-dcc3ae9a5252ea4ffe65b43cdc09ec2654b48000.zip | |
igb: remove media type fiber as it is misleading
The current igb driver only supports copper and serdes. The fiber media
type is a holdover from earlier NICs as the current nics supported by igb
all use serdes when communicating over a fiber connection. As a result we
can remove media type fiber without losing any functionality.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb/e1000_82575.c')
| -rw-r--r-- | drivers/net/igb/e1000_82575.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c index ac28dd5a4fd1..bd3efdb95c64 100644 --- a/drivers/net/igb/e1000_82575.c +++ b/drivers/net/igb/e1000_82575.c @@ -867,8 +867,7 @@ void igb_shutdown_fiber_serdes_link_82575(struct e1000_hw *hw) u32 reg; if (hw->mac.type != e1000_82576 || - (hw->phy.media_type != e1000_media_type_fiber && - hw->phy.media_type != e1000_media_type_internal_serdes)) + hw->phy.media_type != e1000_media_type_internal_serdes) return; /* if the management interface is not enabled, then power down */ |