X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fbroadcom-wl%2Fpatches%2F003-compat-2.6.35.patch;h=89b665371d1392e5be834d496d2025ce75133367;hb=6f5aac5856eafca6766fe098aeeeca4419661fd5;hp=564007b800f08f0c074eda3867242a17b767b9f4;hpb=f9840c8bfeb763d019d21f839f4215863d9d8546;p=openwrt.git

diff --git a/package/broadcom-wl/patches/003-compat-2.6.35.patch b/package/broadcom-wl/patches/003-compat-2.6.35.patch
index 564007b800..89b665371d 100644
--- a/package/broadcom-wl/patches/003-compat-2.6.35.patch
+++ b/package/broadcom-wl/patches/003-compat-2.6.35.patch
@@ -1,20 +1,18 @@
 --- a/driver/wl_linux.c
 +++ b/driver/wl_linux.c
-@@ -2082,8 +2082,12 @@ static void
+@@ -2082,7 +2082,11 @@ 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;
+ 	int i;
  
  	if (!dev)
- 		return;
-@@ -2098,14 +2102,23 @@ _wl_set_multicast_list(struct net_device
+@@ -2098,14 +2102,24 @@ _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 */
@@ -22,6 +20,7 @@
  		for (i = 0, mclist = dev->mc_list; mclist && (i < dev->mc_count);
  			i++, mclist = mclist->next) {
 +#else
++		i = 0;
 +		netdev_for_each_mc_addr(ha, dev) {
 +#endif
  			if (i >= MAXMULTILIST) {
@@ -38,15 +37,3 @@
  		}
  		wl->pub->nmulticast = i;
  		wlc_set(wl->wlc, WLC_SET_PROMISC, (dev->flags & IFF_PROMISC));
---- a/driver/linux_osl.c
-+++ b/driver/linux_osl.c
-@@ -65,7 +65,9 @@ struct osl_info {
- #if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)
- struct pcmcia_dev {
- 	dev_link_t link;	/* PCMCIA device pointer */
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,34)
- 	dev_node_t node;	/* PCMCIA node structure */
-+#endif
- 	void *base;		/* Mapped attribute memory window */
- 	size_t size;		/* Size of window */
- 	void *drv;		/* Driver data */