diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 21:40:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 21:40:25 -0400 |
| commit | 462cee296476278acaa54c41925b3273e0e4dd40 (patch) | |
| tree | c9d9fcfc4dd62807cb67678a6eda0151bfa8be95 /drivers/net/natsemi.c | |
| parent | 126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c (diff) | |
| parent | 4ec5240ec367a592834385893200dd4fb369354c (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'drivers/net/natsemi.c')
| -rw-r--r-- | drivers/net/natsemi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 223bdadd4c0d..babb59e146ea 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
| @@ -2433,9 +2433,9 @@ static void __set_rx_mode(struct net_device *dev) | |||
| 2433 | rx_mode = RxFilterEnable | AcceptBroadcast | 2433 | rx_mode = RxFilterEnable | AcceptBroadcast |
| 2434 | | AcceptMulticast | AcceptMyPhys; | 2434 | | AcceptMulticast | AcceptMyPhys; |
| 2435 | for (i = 0; i < 64; i += 2) { | 2435 | for (i = 0; i < 64; i += 2) { |
| 2436 | writew(HASH_TABLE + i, ioaddr + RxFilterAddr); | 2436 | writel(HASH_TABLE + i, ioaddr + RxFilterAddr); |
| 2437 | writew((mc_filter[i+1]<<8) + mc_filter[i], | 2437 | writel((mc_filter[i + 1] << 8) + mc_filter[i], |
| 2438 | ioaddr + RxFilterData); | 2438 | ioaddr + RxFilterData); |
| 2439 | } | 2439 | } |
| 2440 | } | 2440 | } |
| 2441 | writel(rx_mode, ioaddr + RxFilterAddr); | 2441 | writel(rx_mode, ioaddr + RxFilterAddr); |