This is a note to let you know that I've just added the patch titled
iwlagn: fix change_interface for P2P types
to the 2.6.39-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iwlagn-fix-change_interface-for-p2p-types.patch
and it can be found in the queue-2.6.39 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <sta...@kernel.org> know about it.
>From 5306c0807491e891125f4fb08b04340c91530f57 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.b...@intel.com>
Date: Tue, 21 Jun 2011 08:28:31 -0700
Subject: iwlagn: fix change_interface for P2P types
From: Johannes Berg <johannes.b...@intel.com>
commit 5306c0807491e891125f4fb08b04340c91530f57 upstream.
When an interface changes type to a P2P type,
iwlagn will erroneously set vif->type to the
P2P type and not the reduced/split type. Fix
this by keeping "newtype" in another variable
for the assignment to vif->type.
Signed-off-by: Johannes Berg <johannes.b...@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w....@intel.com>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>
---
drivers/net/wireless/iwlwifi/iwl-core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1772,6 +1772,7 @@ int iwl_mac_change_interface(struct ieee
struct iwl_priv *priv = hw->priv;
struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);
struct iwl_rxon_context *tmp;
+ enum nl80211_iftype newviftype = newtype;
u32 interface_modes;
int err;
@@ -1814,7 +1815,7 @@ int iwl_mac_change_interface(struct ieee
/* success */
iwl_teardown_interface(priv, vif, true);
- vif->type = newtype;
+ vif->type = newviftype;
vif->p2p = newp2p;
err = iwl_setup_interface(priv, ctx);
WARN_ON(err);
Patches currently in stable-queue which might be from johannes.b...@intel.com
are
queue-2.6.39/iwlagn-fix-change_interface-for-p2p-types.patch
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
