---

yaml --- r: 184266 b: refs/heads/master c: e6bdb6f h: refs/heads/master v: v3
git-mirror · Feb 17, 2010 · 98decc3 · 98decc3
1 parent d65faed
commit 98decc3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abe1c3638ccf8b68536afb52b111f6ad46d1cf71
+refs/heads/master: e6bdb6fefc590ad2fb5f79e1d1d3660afbc7c8ff
diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c
@@ -2595,6 +2595,9 @@ void igb_configure_rx_ring(struct igb_adapter *adapter,
 		         E1000_SRRCTL_BSIZEPKT_SHIFT;
 		srrctl |= E1000_SRRCTL_DESCTYPE_ADV_ONEBUF;
 	}
+	/* Only set Drop Enable if we are supporting multiple queues */
+	if (adapter->vfs_allocated_count || adapter->num_rx_queues > 1)
+		srrctl |= E1000_SRRCTL_DROP_EN;
 
 	wr32(E1000_SRRCTL(reg_idx), srrctl);