From cd3e41ca4467be768cc2476da3e4fb1de325a187 Mon Sep 17 00:00:00 2001
From: Greg Rose <gregory.v.rose@intel.com>
Date: Wed, 8 Aug 2012 00:00:58 +0000
Subject: [PATCH] --- yaml --- r: 328063 b: refs/heads/master c:
 0584d999328f3033c038118fb891c9efd5f361df h: refs/heads/master i:   328061:
 fcac29084248569b54fc114e55386a9155a0d50e   328059:
 647898ddeb119857ae9e11d530d9b4bd4c046656   328055:
 ad580d0a2a2845b09a6e48e523583ef270a9756c   328047:
 0f706714ff7ffd8ba3369b1ffeb7c545cf0aa843   328031:
 8a73c0fd0042a197b222b562e2b008689aceb847   327999:
 519c6eb4fe2d28cda8d4b182597e44abe5f8df5d   327935:
 3ebd1de9bf70429a4e717ea91423c18d0538f2c4 v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b0536cd024fb..b53dcfeb9193 100644
--- 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
index 70d27a361857..29465be2a14a 100644
--- 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);