diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 10:27:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-26 10:27:39 -0700 |
| commit | f49809fe9b39e22b0f6f75c86295ce216ce3e374 (patch) | |
| tree | 05f8c05ee71307c9ab02663cfaa5f08a21c6629f /drivers/net/natsemi.c | |
| parent | cdbbde14cb55dd10771ce79154f787322d88411b (diff) | |
| parent | c1ef1f351db70ad60c793b8218dd9f6739cfd66d (diff) | |
Automatic merge of 'for-linus' branch from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
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) 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); |