Automatic merge of /spare/repo/netdev-2.6 branch natsemi

5ea6f2c3 · Jeff Garzik · acb96956 · 760f86d7 · 5ea6f2c3
Commit 5ea6f2c3 authored May 25, 2005 by Committed by Jeff Garzik May 25, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

drivers/net/natsemi.c drivers/net/natsemi.c +3 -3

No files found.
--- 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);
+			writel(HASH_TABLE + i, ioaddr + RxFilterAddr);
-			writew((mc_filter[i+1]<<8) + mc_filter[i],
+			writel((mc_filter[i + 1] << 8) + mc_filter[i],
-				ioaddr + RxFilterData);
+			       ioaddr + RxFilterData);
 		}
 	}
 	writel(rx_mode, ioaddr + RxFilterAddr);