diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/atlx/atlx.c | |
parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/atlx/atlx.c')
-rw-r--r-- | drivers/net/atlx/atlx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atlx/atlx.c b/drivers/net/atlx/atlx.c index 3dc014215679..72f3306352e2 100644 --- a/drivers/net/atlx/atlx.c +++ b/drivers/net/atlx/atlx.c | |||
@@ -144,7 +144,7 @@ static void atlx_set_multi(struct net_device *netdev) | |||
144 | iowrite32(0, (hw->hw_addr + REG_RX_HASH_TABLE) + (1 << 2)); | 144 | iowrite32(0, (hw->hw_addr + REG_RX_HASH_TABLE) + (1 << 2)); |
145 | 145 | ||
146 | /* compute mc addresses' hash value ,and put it into hash table */ | 146 | /* compute mc addresses' hash value ,and put it into hash table */ |
147 | for (mc_ptr = netdev->mc_list; mc_ptr; mc_ptr = mc_ptr->next) { | 147 | netdev_for_each_mc_addr(mc_ptr, netdev) { |
148 | hash_value = atlx_hash_mc_addr(hw, mc_ptr->dmi_addr); | 148 | hash_value = atlx_hash_mc_addr(hw, mc_ptr->dmi_addr); |
149 | atlx_hash_set(hw, hash_value); | 149 | atlx_hash_set(hw, hash_value); |
150 | } | 150 | } |