diff options
| author | Greg KH <greg@press.(none)> | 2005-06-28 01:07:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-28 01:07:56 -0400 |
| commit | 8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (patch) | |
| tree | c43b6c2fdf1b68b66906a2de69446dcec0f9af6b /drivers/usb/net/pegasus.c | |
| parent | 1cde8a16815bd85c8137d1ea556398983c597c11 (diff) | |
| parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/net/pegasus.c')
| -rw-r--r-- | drivers/usb/net/pegasus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/pegasus.c b/drivers/usb/net/pegasus.c index d976790312aa..5f4496d8dbac 100644 --- a/drivers/usb/net/pegasus.c +++ b/drivers/usb/net/pegasus.c | |||
| @@ -1166,7 +1166,7 @@ static void pegasus_set_multicast(struct net_device *net) | |||
| 1166 | pegasus->eth_regs[EthCtrl2] |= RX_PROMISCUOUS; | 1166 | pegasus->eth_regs[EthCtrl2] |= RX_PROMISCUOUS; |
| 1167 | if (netif_msg_link(pegasus)) | 1167 | if (netif_msg_link(pegasus)) |
| 1168 | pr_info("%s: Promiscuous mode enabled.\n", net->name); | 1168 | pr_info("%s: Promiscuous mode enabled.\n", net->name); |
| 1169 | } else if ((net->mc_count > multicast_filter_limit) || | 1169 | } else if (net->mc_count || |
| 1170 | (net->flags & IFF_ALLMULTI)) { | 1170 | (net->flags & IFF_ALLMULTI)) { |
| 1171 | pegasus->eth_regs[EthCtrl0] |= RX_MULTICAST; | 1171 | pegasus->eth_regs[EthCtrl0] |= RX_MULTICAST; |
| 1172 | pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS; | 1172 | pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS; |