From 4e7c193b94182e0d188755b1a5e967a11eae674c Mon Sep 17 00:00:00 2001 From: Greg Rose Date: Fri, 22 Jan 2010 22:47:37 +0000 Subject: [PATCH] --- yaml --- r: 183725 b: refs/heads/master c: da6b33306801af7ee6479c177051e70842974932 h: refs/heads/master i: 183723: 15b1f49048f147d3476ec1ab0fbb1c54613f11a5 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbevf/ixgbevf_main.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7cdccfc010d3..ec9c2a380167 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0456c231a8b2981128cc29e211b7bad1bd997df +refs/heads/master: da6b33306801af7ee6479c177051e70842974932 diff --git a/trunk/drivers/net/ixgbevf/ixgbevf_main.c b/trunk/drivers/net/ixgbevf/ixgbevf_main.c index 0a27fa17e7ff..623353db11ba 100644 --- a/trunk/drivers/net/ixgbevf/ixgbevf_main.c +++ b/trunk/drivers/net/ixgbevf/ixgbevf_main.c @@ -2381,6 +2381,8 @@ static void ixgbevf_watchdog_task(struct work_struct *work) &link_up, false)) != 0) { adapter->link_up = link_up; adapter->link_speed = link_speed; + netif_carrier_off(netdev); + netif_tx_stop_all_queues(netdev); schedule_work(&adapter->reset_task); goto pf_has_reset; }