Commit 1568cc8f authored by Jeff Garzik's avatar Jeff Garzik

Merge pobox.com:/garz/repo/netdev-2.6/mc-filter

into pobox.com:/garz/repo/net-drivers-2.6
parents 97c29f59 d546320d
...@@ -909,7 +909,7 @@ static void set_rx_mode_8012(struct net_device *dev) ...@@ -909,7 +909,7 @@ static void set_rx_mode_8012(struct net_device *dev)
i++, mclist = mclist->next) i++, mclist = mclist->next)
{ {
int filterbit = ether_crc_le(ETH_ALEN, mclist->dmi_addr) & 0x3f; int filterbit = ether_crc_le(ETH_ALEN, mclist->dmi_addr) & 0x3f;
mc_filter[filterbit >> 5] |= cpu_to_le32(1 << (filterbit & 31)); mc_filter[filterbit >> 5] |= 1 << (filterbit & 31);
} }
new_mode = CMR2h_Normal; new_mode = CMR2h_Normal;
} }
......
...@@ -1051,7 +1051,7 @@ static void set_rx_mode(struct net_device *dev) ...@@ -1051,7 +1051,7 @@ static void set_rx_mode(struct net_device *dev)
else else
filterbit = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; filterbit = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
filterbit &= 0x3f; filterbit &= 0x3f;
mc_filter[filterbit >> 5] |= cpu_to_le32(1 << (filterbit & 31)); mc_filter[filterbit >> 5] |= 1 << (filterbit & 31);
if (tulip_debug > 2) { if (tulip_debug > 2) {
printk(KERN_INFO "%s: Added filter for %2.2x:%2.2x:%2.2x:" printk(KERN_INFO "%s: Added filter for %2.2x:%2.2x:%2.2x:"
"%2.2x:%2.2x:%2.2x %8.8x bit %d.\n", dev->name, "%2.2x:%2.2x:%2.2x %8.8x bit %d.\n", dev->name,
......
...@@ -1410,7 +1410,7 @@ static u32 __set_rx_mode(struct net_device *dev) ...@@ -1410,7 +1410,7 @@ static u32 __set_rx_mode(struct net_device *dev)
i++, mclist = mclist->next) { i++, mclist = mclist->next) {
int filterbit = (ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26) ^ 0x3F; int filterbit = (ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26) ^ 0x3F;
filterbit &= 0x3f; filterbit &= 0x3f;
mc_filter[filterbit >> 5] |= cpu_to_le32(1 << (filterbit & 31)); mc_filter[filterbit >> 5] |= 1 << (filterbit & 31);
} }
rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment