From: Greg Kroah-Hartman Date: Wed, 4 Sep 2013 00:07:08 +0000 (-0700) Subject: delete mac80211-add-missing-channel-context-release.patch from 3.0 and 3.4 X-Git-Tag: v3.0.95~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b3785ade7269a77a518b1d338e04553715dfb4e;p=thirdparty%2Fkernel%2Fstable-queue.git delete mac80211-add-missing-channel-context-release.patch from 3.0 and 3.4 --- diff --git a/queue-3.0/mac80211-add-missing-channel-context-release.patch b/queue-3.0/mac80211-add-missing-channel-context-release.patch deleted file mode 100644 index 629abe96da9..00000000000 --- a/queue-3.0/mac80211-add-missing-channel-context-release.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2a3ba63c235fdcd37f6451bdf4a0c7865a3930cf Mon Sep 17 00:00:00 2001 -From: Johannes Berg -Date: Tue, 20 Aug 2013 11:28:50 +0200 -Subject: mac80211: add missing channel context release - -From: Johannes Berg - -commit 2a3ba63c235fdcd37f6451bdf4a0c7865a3930cf upstream. - -IBSS needs to release the channel context when leaving -but I evidently missed that. Fix it. - -Signed-off-by: Johannes Berg -Signed-off-by: Greg Kroah-Hartman - ---- - net/mac80211/ibss.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/net/mac80211/ibss.c -+++ b/net/mac80211/ibss.c -@@ -999,6 +999,7 @@ int ieee80211_ibss_leave(struct ieee8021 - sdata->vif.bss_conf.ibss_joined = false; - ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED | - BSS_CHANGED_IBSS); -+ ieee80211_vif_release_channel(sdata); - synchronize_rcu(); - kfree_skb(skb); - diff --git a/queue-3.0/series b/queue-3.0/series index e8ed66c628e..11db00c6e93 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -2,4 +2,3 @@ jfs-fix-readdir-cookie-incompatibility-with-nfsv4.patch alsa-opti9xx-fix-conflicting-driver-object-name.patch drivers-base-memory.c-fix-show_mem_removable-to-handle-missing-sections.patch ath9k_htc-restore-skb-headroom-when-returning-skb-to-mac80211.patch -mac80211-add-missing-channel-context-release.patch diff --git a/queue-3.4/mac80211-add-missing-channel-context-release.patch b/queue-3.4/mac80211-add-missing-channel-context-release.patch deleted file mode 100644 index d4a3d5ab3d4..00000000000 --- a/queue-3.4/mac80211-add-missing-channel-context-release.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 2a3ba63c235fdcd37f6451bdf4a0c7865a3930cf Mon Sep 17 00:00:00 2001 -From: Johannes Berg -Date: Tue, 20 Aug 2013 11:28:50 +0200 -Subject: mac80211: add missing channel context release - -From: Johannes Berg - -commit 2a3ba63c235fdcd37f6451bdf4a0c7865a3930cf upstream. - -IBSS needs to release the channel context when leaving -but I evidently missed that. Fix it. - -Signed-off-by: Johannes Berg -Signed-off-by: Greg Kroah-Hartman - ---- - net/mac80211/ibss.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/net/mac80211/ibss.c -+++ b/net/mac80211/ibss.c -@@ -1200,6 +1200,7 @@ int ieee80211_ibss_leave(struct ieee8021 - sdata->vif.bss_conf.ibss_joined = false; - ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED | - BSS_CHANGED_IBSS); -+ ieee80211_vif_release_channel(sdata); - synchronize_rcu(); - kfree_skb(skb); - diff --git a/queue-3.4/series b/queue-3.4/series index b89b11b34b4..457c5efc7ec 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -8,5 +8,4 @@ drm-vmwgfx-split-gmr2_remap-commands-if-they-are-to-large.patch drm-i915-ivb-fix-edp-voltage-swing-reg-val.patch sunrpc-fix-memory-corruption-issue-on-32-bit-highmem-systems.patch ath9k_htc-restore-skb-headroom-when-returning-skb-to-mac80211.patch -mac80211-add-missing-channel-context-release.patch iwl4965-fix-rfkill-set-state-regression.patch