diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-01-17 14:49:06 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-01-17 14:49:06 -0500 |
| commit | 1568cc8f2dcca2eeb51e9b0b34fbb77b4c1502ce (patch) | |
| tree | 1dafc567533fc857f2938f44ed23d4a2abdeceed | |
| parent | 97c29f596d6daa197856a1f50431bc998e9f1be7 (diff) | |
| parent | d546320d54ee39d2e8d6ecb7a0557a1e9eb8bc14 (diff) | |
Merge pobox.com:/garz/repo/netdev-2.6/mc-filter
into pobox.com:/garz/repo/net-drivers-2.6
| -rw-r--r-- | drivers/net/atp.c | 2 | ||||
| -rw-r--r-- | drivers/net/tulip/tulip_core.c | 2 | ||||
| -rw-r--r-- | drivers/net/tulip/winbond-840.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/atp.c b/drivers/net/atp.c index 16f7f164a070..bfa674ed4494 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c @@ -909,7 +909,7 @@ static void set_rx_mode_8012(struct net_device *dev) i++, mclist = mclist->next) { 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; } diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index 87f580093687..6b5ba2964ac8 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c @@ -1051,7 +1051,7 @@ static void set_rx_mode(struct net_device *dev) else filterbit = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; filterbit &= 0x3f; - mc_filter[filterbit >> 5] |= cpu_to_le32(1 << (filterbit & 31)); + mc_filter[filterbit >> 5] |= 1 << (filterbit & 31); if (tulip_debug > 2) { 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, diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 57d33df3f0dc..f7e64ee11b1d 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c @@ -1410,7 +1410,7 @@ static u32 __set_rx_mode(struct net_device *dev) i++, mclist = mclist->next) { int filterbit = (ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26) ^ 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; } |