aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igb/igb_main.c
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-03-31 16:38:00 -0400
committerDavid S. Miller <davem@davemloft.net>2009-04-02 03:59:06 -0400
commit59c3de8944e04799643e6980c3ea6a30860ad39b (patch)
tree7d0b1568bc779c832cde38dbdd2bab9c4addf703 /drivers/net/igb/igb_main.c
parent9404c82b5ea3237f43732d8afd4d1c0dc8f0f3ed (diff)
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/net/igb/igb_main.c')
-rw-r--r--drivers/net/igb/igb_main.c7
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,
1476 netdev->name, 1476 netdev->name,
1477 ((hw->bus.speed == e1000_bus_speed_2500) 1477 ((hw->bus.speed == e1000_bus_speed_2500)
1478 ? "2.5Gb/s" : "unknown"), 1478 ? "2.5Gb/s" : "unknown"),
1479 ((hw->bus.width == e1000_bus_width_pcie_x4) 1479 ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :
1480 ? "Width x4" : (hw->bus.width == e1000_bus_width_pcie_x1) 1480 (hw->bus.width == e1000_bus_width_pcie_x2) ? "Width x2" :
1481 ? "Width x1" : "unknown"), 1481 (hw->bus.width == e1000_bus_width_pcie_x1) ? "Width x1" :
1482 "unknown"),
1482 netdev->dev_addr); 1483 netdev->dev_addr);
1483 1484
1484 igb_read_part_num(hw, &part_num); 1485 igb_read_part_num(hw, &part_num);