From 02daf782a1f9f8e3396a8edbf022d0d5efd7c9bd Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 30 Aug 2010 13:55:42 -0700 Subject: [PATCH] compat-wireless: fix patches/25-multicast-list_head.patch This required some manual context fix. Signed-off-by: Luis R. Rodriguez --- patches/25-multicast-list_head.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index 85ead25b007c..4b0fdf29bce0 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -652,20 +652,21 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -396,7 +396,12 @@ static int ieee80211_stop(struct net_dev +@@ -417,8 +417,13 @@ - netif_addr_lock_bh(dev); + netif_addr_lock_bh(sdata->dev); spin_lock_bh(&local->filter_lock); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) - __hw_addr_unsync(&local->mc_list, &dev->mc, dev->addr_len); + __hw_addr_unsync(&local->mc_list, &sdata->dev->mc, + sdata->dev->addr_len); +#else + __dev_addr_unsync(&local->mc_list, &local->mc_count, + &dev->mc_list, &dev->mc_count); +#endif spin_unlock_bh(&local->filter_lock); - netif_addr_unlock_bh(dev); + netif_addr_unlock_bh(sdata->dev); -@@ -580,7 +585,12 @@ static void ieee80211_set_multicast_list +@@ -602,7 +607,12 @@ sdata->flags ^= IEEE80211_SDATA_PROMISC; } spin_lock_bh(&local->filter_lock); -- 2.30.2