---

yaml --- r: 328063 b: refs/heads/master c: 0584d99 h: refs/heads/master i: 328061: fcac290 328059: 647898d 328055: ad580d0 328047: 0f70671 328031: 8a73c0f 327999: 519c6eb 327935: 3ebd1de v: v3
git-mirror · Sep 24, 2012 · cd3e41c · cd3e41c
1 parent cee3957
commit cd3e41c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b2cd27f834e526f933aa63ce91964b7581271f4
+refs/heads/master: 0584d999328f3033c038118fb891c9efd5f361df
diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -5560,8 +5560,9 @@ static void ixgbe_spoof_check(struct ixgbe_adapter *adapter)
 {
 	u32 ssvpc;
 
-	/* Do not perform spoof check for 82598 */
-	if (adapter->hw.mac.type == ixgbe_mac_82598EB)
+	/* Do not perform spoof check for 82598 or if not in IOV mode */
+	if (adapter->hw.mac.type == ixgbe_mac_82598EB ||
+	    adapter->num_vfs == 0)
 		return;
 
 	ssvpc = IXGBE_READ_REG(&adapter->hw, IXGBE_SSVPC);