2010-07-11 22:00:23 +03:00
|
|
|
--- 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));
|
2010-07-11 22:33:46 +03:00
|
|
|
--- 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 */
|
