Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 351491
b: refs/heads/master
c: 6fe5967
h: refs/heads/master
i:
  351489: f85113d
  351487: 2145518
v: v3
  • Loading branch information
Greg Rose authored and Jeff Kirsher committed Jan 19, 2013
1 parent ddb8ce7 commit 1f9976a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1e72bfc39d772ccb49f95d5b296a35c348796022
refs/heads/master: 6fe59675500760dd21ef8a339fa129f7adb596c8
9 changes: 5 additions & 4 deletions trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2240,17 +2240,18 @@ static void ixgbevf_watchdog_task(struct work_struct *work)

if (link_up) {
if (!netif_carrier_ok(netdev)) {
hw_dbg(&adapter->hw, "NIC Link is Up, %u Gbps\n",
(link_speed == IXGBE_LINK_SPEED_10GB_FULL) ?
10 : 1);
dev_info(&adapter->pdev->dev,
"NIC Link is Up, %u Gbps\n",
(link_speed == IXGBE_LINK_SPEED_10GB_FULL) ?
10 : 1);
netif_carrier_on(netdev);
netif_tx_wake_all_queues(netdev);
}
} else {
adapter->link_up = false;
adapter->link_speed = 0;
if (netif_carrier_ok(netdev)) {
hw_dbg(&adapter->hw, "NIC Link is Down\n");
dev_info(&adapter->pdev->dev, "NIC Link is Down\n");
netif_carrier_off(netdev);
netif_tx_stop_all_queues(netdev);
}
Expand Down

0 comments on commit 1f9976a

Please sign in to comment.