diff options
Diffstat (limited to 'drivers/net/wireless/adm8211.c')
-rw-r--r-- | drivers/net/wireless/adm8211.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c index 547912e6843f..880ad9d170c2 100644 --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | #include <linux/if.h> | 19 | #include <linux/if.h> |
20 | #include <linux/skbuff.h> | 20 | #include <linux/skbuff.h> |
21 | #include <linux/slab.h> | ||
21 | #include <linux/etherdevice.h> | 22 | #include <linux/etherdevice.h> |
22 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
23 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
@@ -1317,21 +1318,19 @@ static void adm8211_bss_info_changed(struct ieee80211_hw *dev, | |||
1317 | } | 1318 | } |
1318 | 1319 | ||
1319 | static u64 adm8211_prepare_multicast(struct ieee80211_hw *hw, | 1320 | static u64 adm8211_prepare_multicast(struct ieee80211_hw *hw, |
1320 | int mc_count, struct dev_addr_list *mclist) | 1321 | struct netdev_hw_addr_list *mc_list) |
1321 | { | 1322 | { |
1322 | unsigned int bit_nr, i; | 1323 | unsigned int bit_nr; |
1323 | u32 mc_filter[2]; | 1324 | u32 mc_filter[2]; |
1325 | struct netdev_hw_addr *ha; | ||
1324 | 1326 | ||
1325 | mc_filter[1] = mc_filter[0] = 0; | 1327 | mc_filter[1] = mc_filter[0] = 0; |
1326 | 1328 | ||
1327 | for (i = 0; i < mc_count; i++) { | 1329 | netdev_hw_addr_list_for_each(ha, mc_list) { |
1328 | if (!mclist) | 1330 | bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26; |
1329 | break; | ||
1330 | bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; | ||
1331 | 1331 | ||
1332 | bit_nr &= 0x3F; | 1332 | bit_nr &= 0x3F; |
1333 | mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); | 1333 | mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); |
1334 | mclist = mclist->next; | ||
1335 | } | 1334 | } |
1336 | 1335 | ||
1337 | return mc_filter[0] | ((u64)(mc_filter[1]) << 32); | 1336 | return mc_filter[0] | ((u64)(mc_filter[1]) << 32); |