This is a note to let you know that I've just added the patch titled mac80211_hwsim: remove P2P_DEVICE support to the 3.9-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: mac80211_hwsim-remove-p2p_device-support.patch and it can be found in the queue-3.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From johannes@xxxxxxxxxxxxxxxx Wed Jun 5 13:26:01 2013 From: Johannes Berg <johannes@xxxxxxxxxxxxxxxx> Date: Thu, 23 May 2013 22:24:11 +0200 Subject: mac80211_hwsim: remove P2P_DEVICE support To: linux-wireless@xxxxxxxxxxxxxxx Cc: stable@xxxxxxxxxxxxxxx, Jouni Malinen <j@xxxxx>, Arend van Spriel <arend@xxxxxxxxxxxx>, Johannes Berg <johannes.berg@xxxxxxxxx> Message-ID: <1369340651-14475-1-git-send-email-johannes@xxxxxxxxxxxxxxxx> From: Johannes Berg <johannes.berg@xxxxxxxxx> Unfortunately, advertising P2P_DEVICE support was a little premature, a number of issues came up in testing and have been fixed for 3.10. Rather than try to backport all the different fixes, disable P2P_DEVICE support in the drivers using it. Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/net/wireless/mac80211_hwsim.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -2118,7 +2118,6 @@ static const struct ieee80211_iface_limi #endif BIT(NL80211_IFTYPE_AP) | BIT(NL80211_IFTYPE_P2P_GO) }, - { .max = 1, .types = BIT(NL80211_IFTYPE_P2P_DEVICE) }, }; static struct ieee80211_iface_combination hwsim_if_comb = { @@ -2230,8 +2229,7 @@ static int __init init_mac80211_hwsim(vo BIT(NL80211_IFTYPE_P2P_CLIENT) | BIT(NL80211_IFTYPE_P2P_GO) | BIT(NL80211_IFTYPE_ADHOC) | - BIT(NL80211_IFTYPE_MESH_POINT) | - BIT(NL80211_IFTYPE_P2P_DEVICE); + BIT(NL80211_IFTYPE_MESH_POINT); hw->flags = IEEE80211_HW_MFP_CAPABLE | IEEE80211_HW_SIGNAL_DBM | Patches currently in stable-queue which might be from johannes@xxxxxxxxxxxxxxxx are queue-3.9/mac80211_hwsim-remove-p2p_device-support.patch queue-3.9/iwlwifi-mvm-remove-p2p_device-support.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html