kernel: fix build problems with recent kernel versions
[openwrt/svn-archive/archive.git] / package / broadcom-wl / patches / 003-compat-2.6.35.patch
1 --- a/driver/wl_linux.c
2 +++ b/driver/wl_linux.c
3 @@ -2082,8 +2082,12 @@ static void
4 _wl_set_multicast_list(struct net_device *dev)
5 {
6 wl_info_t *wl;
7 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,34)
8 struct dev_mc_list *mclist;
9 - int i;
10 +#else
11 + struct netdev_hw_addr *ha;
12 +#endif
13 + int i = 0;
14
15 if (!dev)
16 return;
17 @@ -2098,14 +2102,23 @@ _wl_set_multicast_list(struct net_device
18 wl->pub->allmulti = (dev->flags & IFF_ALLMULTI)? TRUE: FALSE;
19
20 /* copy the list of multicasts into our private table */
21 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,34)
22 for (i = 0, mclist = dev->mc_list; mclist && (i < dev->mc_count);
23 i++, mclist = mclist->next) {
24 +#else
25 + netdev_for_each_mc_addr(ha, dev) {
26 +#endif
27 if (i >= MAXMULTILIST) {
28 wl->pub->allmulti = TRUE;
29 i = 0;
30 break;
31 }
32 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,34)
33 wl->pub->multicast[i] = *((struct ether_addr*) mclist->dmi_addr);
34 +#else
35 + wl->pub->multicast[i] = *((struct ether_addr*) ha->addr);
36 + i++;
37 +#endif
38 }
39 wl->pub->nmulticast = i;
40 wlc_set(wl->wlc, WLC_SET_PROMISC, (dev->flags & IFF_PROMISC));