diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2010-07-11 19:00:23 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-07-11 19:00:23 +0000 |
| commit | 168a565cbd7f64a66ed992d08b74622ced0e8d45 (patch) | |
| tree | 914b42010de28d6c90748570183e75e6606261f9 /package/broadcom-wl/patches | |
| parent | 208fd71865f629427086fadc0d9ecc96a59ab34c (diff) | |
| download | upstream-168a565cbd7f64a66ed992d08b74622ced0e8d45.tar.gz upstream-168a565cbd7f64a66ed992d08b74622ced0e8d45.tar.bz2 upstream-168a565cbd7f64a66ed992d08b74622ced0e8d45.zip | |
kernel: fix build problems with recent kernel versions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22137 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/broadcom-wl/patches')
| -rw-r--r-- | package/broadcom-wl/patches/003-compat-2.6.35.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/package/broadcom-wl/patches/003-compat-2.6.35.patch b/package/broadcom-wl/patches/003-compat-2.6.35.patch new file mode 100644 index 0000000000..3bb786c140 --- /dev/null +++ b/package/broadcom-wl/patches/003-compat-2.6.35.patch @@ -0,0 +1,40 @@ +--- a/driver/wl_linux.c ++++ b/driver/wl_linux.c +@@ -2082,8 +2082,12 @@ static void + _wl_set_multicast_list(struct net_device *dev) + { + wl_info_t *wl; ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,34) + struct dev_mc_list *mclist; +- int i; ++#else ++ struct netdev_hw_addr *ha; ++#endif ++ int i = 0; + + if (!dev) + return; +@@ -2098,14 +2102,23 @@ _wl_set_multicast_list(struct net_device + wl->pub->allmulti = (dev->flags & IFF_ALLMULTI)? TRUE: FALSE; + + /* copy the list of multicasts into our private table */ ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,34) + for (i = 0, mclist = dev->mc_list; mclist && (i < dev->mc_count); + i++, mclist = mclist->next) { ++#else ++ netdev_for_each_mc_addr(ha, dev) { ++#endif + if (i >= MAXMULTILIST) { + wl->pub->allmulti = TRUE; + i = 0; + break; + } ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,34) + wl->pub->multicast[i] = *((struct ether_addr*) mclist->dmi_addr); ++#else ++ wl->pub->multicast[i] = *((struct ether_addr*) ha->addr); ++ i++; ++#endif + } + wl->pub->nmulticast = i; + wlc_set(wl->wlc, WLC_SET_PROMISC, (dev->flags & IFF_PROMISC)); |