Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ea6f2c3 authored by Jeff Garzik's avatar Jeff Garzik Committed by Jeff Garzik
Browse files

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

parents acb96956 760f86d7

drivers/net/natsemi.c

+3 −3
Original line number Diff line number Diff line
@@ -2433,8 +2433,8 @@ 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],

			writel(HASH_TABLE + i, ioaddr + RxFilterAddr);

			writel((mc_filter[i + 1] << 8) + mc_filter[i],

			       ioaddr + RxFilterData);

		}

	}