diff options
| author | Alexander Duyck | 2009-03-31 22:38:00 +0200 |
|---|---|---|
| committer | David S. Miller | 2009-04-02 09:59:06 +0200 |
| commit | 59c3de8944e04799643e6980c3ea6a30860ad39b (patch) | |
| tree | 7d0b1568bc779c832cde38dbdd2bab9c4addf703 /drivers | |
| parent | net/fec_mpc52xx: Don't dereference phy_device if it is NULL (diff) | |
| download | kernel-qcow2-linux-59c3de8944e04799643e6980c3ea6a30860ad39b.tar.gz kernel-qcow2-linux-59c3de8944e04799643e6980c3ea6a30860ad39b.tar.xz kernel-qcow2-linux-59c3de8944e04799643e6980c3ea6a30860ad39b.zip | |
igb: add support for x2 link width configurations
When device is on PCIe link trained as x2 the driver is currently reporting
link width as "unknown". The original patch provided by Myron adds the x2
link support and my changes are cosmetic to clean up the readability of the
conditional operators.
Based on work by: Myron Stowe <myron.stowe@hp.com>
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')
| -rw-r--r-- | drivers/net/igb/igb_main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index ca842163dce4..be02045a5078 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -1476,9 +1476,10 @@ static int __devinit igb_probe(struct pci_dev *pdev, netdev->name, ((hw->bus.speed == e1000_bus_speed_2500) ? "2.5Gb/s" : "unknown"), - ((hw->bus.width == e1000_bus_width_pcie_x4) - ? "Width x4" : (hw->bus.width == e1000_bus_width_pcie_x1) - ? "Width x1" : "unknown"), + ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" : + (hw->bus.width == e1000_bus_width_pcie_x2) ? "Width x2" : + (hw->bus.width == e1000_bus_width_pcie_x1) ? "Width x1" : + "unknown"), netdev->dev_addr); igb_read_part_num(hw, &part_num); |