Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 3604
b: refs/heads/master
c: ae0a97b
h: refs/heads/master
v: v3
  • Loading branch information
YOSHIFUJI Hideaki authored and Jeff Garzik committed Jun 27, 2005
1 parent a5a3d85 commit 7d66f4d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e8d997952bbea4f408f56a55f18667f2817dbb44
refs/heads/master: ae0a97bfda598088b6f97db9d9f65cd6c4f439c6
2 changes: 1 addition & 1 deletion trunk/drivers/usb/net/pegasus.c
Original file line number Diff line number Diff line change
Expand Up @@ -1166,7 +1166,7 @@ static void pegasus_set_multicast(struct net_device *net)
pegasus->eth_regs[EthCtrl2] |= RX_PROMISCUOUS;
if (netif_msg_link(pegasus))
pr_info("%s: Promiscuous mode enabled.\n", net->name);
} else if ((net->mc_count > multicast_filter_limit) ||
} else if (net->mc_count ||
(net->flags & IFF_ALLMULTI)) {
pegasus->eth_regs[EthCtrl0] |= RX_MULTICAST;
pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/net/rtl8150.c
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ static void rtl8150_set_multicast(struct net_device *netdev)
if (netdev->flags & IFF_PROMISC) {
dev->rx_creg |= cpu_to_le16(0x0001);
info("%s: promiscuous mode", netdev->name);
} else if ((netdev->mc_count > multicast_filter_limit) ||
} else if (netdev->mc_count ||
(netdev->flags & IFF_ALLMULTI)) {
dev->rx_creg &= cpu_to_le16(0xfffe);
dev->rx_creg |= cpu_to_le16(0x0002);
Expand Down

0 comments on commit 7d66f4d

Please sign in to comment.