compat-wireless: refresh patch
authorHauke Mehrtens <hauke@hauke-m.de>
Tue, 29 Jun 2010 20:36:15 +0000 (22:36 +0200)
committerLuis R. Rodriguez <lrodriguez@atheros.com>
Wed, 7 Jul 2010 20:46:56 +0000 (13:46 -0700)
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
patches/25-multicast-list_head.patch

index f7304cbd406e5539e768a8c6ad04cfd8999c3f78..f3746cada4bd126a94e1c30a0aa532eb88ac7858 100644 (file)
@@ -419,7 +419,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
                              size_t fw_name_len, u32 *hw_ver);
 --- a/drivers/net/wireless/rndis_wlan.c
 +++ b/drivers/net/wireless/rndis_wlan.c
-@@ -1587,7 +1587,11 @@ static void set_multicast_list(struct us
+@@ -1588,7 +1588,11 @@ static void set_multicast_list(struct us
  
                netdev_for_each_mc_addr(ha, usbdev->net)
                        memcpy(mc_addrs + i++ * ETH_ALEN,
@@ -601,9 +601,9 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
 +                      memcpy(__skb_put(skb, ETH_ALEN), ha->dmi_addr, ETH_ALEN);
 +                      memcpy(__skb_put(skb, ETH_ALEN), ha->dmi_addr, ETH_ALEN);
 +#endif
+                       i++;
                }
-               r->len = htons(skb->len - len);
-       }
 --- a/net/mac80211/driver-ops.h
 +++ b/net/mac80211/driver-ops.h
 @@ -90,14 +90,28 @@ static inline void drv_bss_info_changed(