aboutsummaryrefslogtreecommitdiffstats
path: root/package/broadcom-wl/patches/003-compat-2.6.35.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-07-11 19:00:23 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-07-11 19:00:23 +0000
commit02a147de0c298c612049409fd4d64b12dc3d9ba1 (patch)
treee925e5933e9a73b69ca93f844c6b29cabdab717d /package/broadcom-wl/patches/003-compat-2.6.35.patch
parent91ce82ef77211009cb21988845a7405f5ddbfcc6 (diff)
downloadupstream-02a147de0c298c612049409fd4d64b12dc3d9ba1.tar.gz
upstream-02a147de0c298c612049409fd4d64b12dc3d9ba1.tar.bz2
upstream-02a147de0c298c612049409fd4d64b12dc3d9ba1.zip
kernel: fix build problems with recent kernel versions
SVN-Revision: 22137
Diffstat (limited to 'package/broadcom-wl/patches/003-compat-2.6.35.patch')
-rw-r--r--package/broadcom-wl/patches/003-compat-2.6.35.patch40
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));