---

yaml --- r: 41761 b: refs/heads/master c: 7510873 h: refs/heads/master i: 41759: 98b3622 v: v3
git-mirror · Dec 3, 2006 · 7d1e93a · 7d1e93a
1 parent 90697c2
commit 7d1e93a
Show file tree

Hide file tree

Showing 3 changed files with 692 additions and 382 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb22f58087fdf8b617803c9b65bc86c6d26b5115
+refs/heads/master: 7510873d8659f4192cb5b3327f748e401d216399
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
@@ -2040,7 +2040,8 @@ bnx2_set_rx_mode(struct net_device *dev)
 	if (dev->flags & IFF_PROMISC) {
 		/* Promiscuous mode. */
 		rx_mode |= BNX2_EMAC_RX_MODE_PROMISCUOUS;
-		sort_mode |= BNX2_RPM_SORT_USER0_PROM_EN;
+		sort_mode |= BNX2_RPM_SORT_USER0_PROM_EN |
+			     BNX2_RPM_SORT_USER0_PROM_VLAN;
 	}
 	else if (dev->flags & IFF_ALLMULTI) {
 		for (i = 0; i < NUM_MC_HASH_REGISTERS; i++) {