---

yaml --- r: 225395 b: refs/heads/master c: 0e512bf h: refs/heads/master i: 225393: c18b3c2 225391: a276991 v: v3
git-mirror · Dec 25, 2010 · ac6adaf · ac6adaf
1 parent 67f1c48
commit ac6adaf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13800469d40bf4dc9fbed17f4692b2ebe94d4526
+refs/heads/master: 0e512bfc2c0cd6072387092f8d1ac8e1a758965b
diff --git a/trunk/drivers/net/igbvf/vf.c b/trunk/drivers/net/igbvf/vf.c
@@ -362,8 +362,8 @@ static s32 e1000_check_for_link_vf(struct e1000_hw *hw)
 	 * or a virtual function reset
 	 */
 
-	/* If we were hit with a reset drop the link */
-	if (!mbx->ops.check_for_rst(hw))
+	/* If we were hit with a reset or timeout drop the link */
+	if (!mbx->ops.check_for_rst(hw) || !mbx->timeout)
 		mac->get_link_status = true;
 
 	if (!mac->get_link_status)