crda: fix circular dependency
[openwrt-10.03/.git] / package / mac80211 / patches / 017-carl9170_addr_backport.patch
1 --- a/drivers/net/wireless/ath/carl9170/main.c
2 +++ b/drivers/net/wireless/ath/carl9170/main.c
3 @@ -811,16 +811,34 @@ out:
4  }
5  
6  static u64 carl9170_op_prepare_multicast(struct ieee80211_hw *hw,
7 -                                        struct netdev_hw_addr_list *mc_list)
8 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
9 +                                  struct netdev_hw_addr_list *mc_list)
10 +#else
11 +                                  int mc_count, struct dev_addr_list *ha)
12 +#endif
13  {
14 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
15         struct netdev_hw_addr *ha;
16 +#else
17 +       int i;
18 +#endif
19         u64 mchash;
20  
21         /* always get broadcast frames */
22         mchash = 1ULL << (0xff >> 2);
23  
24 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
25         netdev_hw_addr_list_for_each(ha, mc_list)
26                 mchash |= 1ULL << (ha->addr[5] >> 2);
27 +#else
28 +       for (i = 0; i < mc_count; i++) {
29 +               if (!ha)
30 +                       break;
31 +
32 +               mchash |= 1ULL << (ha->dmi_addr[5] >> 2);
33 +               ha = ha->next;
34 +       }
35 +#endif
36  
37         return mchash;
38  }