diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-08 14:30:29 +0200 | 
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-08 14:30:29 +0200 | 
| commit | 0a2d31b62dba9b5b92a38c67c9cc42630513662a (patch) | |
| tree | f755d74ec85248de645e10c45ed1a2ed467530f6 /drivers/net/sunqe.c | |
| parent | 8039290a91c5dc4414093c086987a5d7738fe2fd (diff) | |
| parent | df944f66784e6d4f2f50739263a4947885d8b6ae (diff) | |
Merge branch 'fix/kconfig' into for-linus
Diffstat (limited to 'drivers/net/sunqe.c')
| -rw-r--r-- | drivers/net/sunqe.c | 7 | 
1 files changed, 1 insertions, 6 deletions
| diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c index 18ecdc303751..209c7f8df003 100644 --- a/drivers/net/sunqe.c +++ b/drivers/net/sunqe.c @@ -628,7 +628,6 @@ static void qe_set_multicast(struct net_device *dev)  	struct sunqe *qep = netdev_priv(dev);  	struct netdev_hw_addr *ha;  	u8 new_mconfig = qep->mconfig; -	char *addrs;  	int i;  	u32 crc; @@ -651,11 +650,7 @@ static void qe_set_multicast(struct net_device *dev)  		memset(hash_table, 0, sizeof(hash_table));  		netdev_for_each_mc_addr(ha, dev) { -			addrs = ha->addr; - -			if (!(*addrs & 1)) -				continue; -			crc = ether_crc_le(6, addrs); +			crc = ether_crc_le(6, ha->addr);  			crc >>= 26;  			hash_table[crc >> 4] |= 1 << (crc & 0xf);  		} | 
