Skip to content

Commit

Permalink
Automatic merge of /spare/repo/netdev-2.6 branch natsemi
Browse files Browse the repository at this point in the history
  • Loading branch information
Unknown authored and Jeff Garzik committed May 26, 2005
2 parents acb9695 + 760f86d commit 5ea6f2c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/natsemi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 5ea6f2c

Please sign in to comment.