summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
author <jgarzik@pretzel.yyz.us>2005-05-25 22:10:38 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-05-25 22:10:38 -0400
commit5ea6f2c33f0c8b126136dbf1776ffbc444772cd7 (patch)
tree6c0623142810d4c5cd00e5d594955d28a41eee3f /drivers
parentacb969560d5b42500697a8bcd1667ac824928383 (diff)
parent760f86d78d92f39e2ceb55b40f0885eb755c8c2f (diff)
downloadlinux-3.10-5ea6f2c33f0c8b126136dbf1776ffbc444772cd7.tar.gz
linux-3.10-5ea6f2c33f0c8b126136dbf1776ffbc444772cd7.tar.bz2
linux-3.10-5ea6f2c33f0c8b126136dbf1776ffbc444772cd7.zip
Automatic merge of /spare/repo/netdev-2.6 branch natsemi
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/natsemi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 223bdadd4c0..babb59e146e 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -2433,9 +2433,9 @@ static void __set_rx_mode(struct net_device *dev)
rx_mode = RxFilterEnable | AcceptBroadcast
| AcceptMulticast | AcceptMyPhys;
for (i = 0; i < 64; i += 2) {
- writew(HASH_TABLE + i, ioaddr + RxFilterAddr);
- writew((mc_filter[i+1]<<8) + mc_filter[i],
- ioaddr + RxFilterData);
+ writel(HASH_TABLE + i, ioaddr + RxFilterAddr);
+ writel((mc_filter[i + 1] << 8) + mc_filter[i],
+ ioaddr + RxFilterData);
}
}
writel(rx_mode, ioaddr + RxFilterAddr);