[PATCH 3.11] cfg80211: fix P2P GO interface teardown

[PATCH 3.11] cfg80211: fix P2P GO interface teardown

[Johannes Berg]

From: Johannes Berg <johannes.berg@intel.com>

When a P2P GO interface goes down, cfg80211 doesn't properly
tear it down, leading to warnings later. Add the GO interface
type to the enumeration to tear it down like AP interfaces.
Otherwise, we leave it pending and mac80211's state can get
very confused, leading to warnings later.

Cc: stable@vger.kernel.org
Reported-by: Ilan Peer <ilan.peer@intel.com>
Tested-by: Ilan Peer <ilan.peer@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 net/wireless/core.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 4f9f216..a8c29fa4 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -765,6 +765,7 @@ void cfg80211_leave(struct cfg80211_registered_device *rdev,
 		cfg80211_leave_mesh(rdev, dev);
 		break;
 	case NL80211_IFTYPE_AP:
+	case NL80211_IFTYPE_P2P_GO:
 		cfg80211_stop_ap(rdev, dev);
 		break;
 	default:
-- 
1.8.0

Re: [PATCH 3.11] cfg80211: fix P2P GO interface teardown

[Johannes Berg]

On Wed, 2013-07-31 at 21:02 +0200, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
> 
> When a P2P GO interface goes down, cfg80211 doesn't properly
> tear it down, leading to warnings later. Add the GO interface
> type to the enumeration to tear it down like AP interfaces.
> Otherwise, we leave it pending and mac80211's state can get
> very confused, leading to warnings later.

Applied

(it's obvious and we've tested it for a while)

johannes

Re: [PATCH 3.11] cfg80211: fix P2P GO interface teardown

[Arend van Spriel]

On 07/31/2013 09:17 PM, Johannes Berg wrote:
> On Wed, 2013-07-31 at 21:02 +0200, Johannes Berg wrote:
>> From: Johannes Berg <johannes.berg@intel.com>
>>
>> When a P2P GO interface goes down, cfg80211 doesn't properly
>> tear it down, leading to warnings later. Add the GO interface
>> type to the enumeration to tear it down like AP interfaces.
>> Otherwise, we leave it pending and mac80211's state can get
>> very confused, leading to warnings later.
>
> Applied
>
> (it's obvious and we've tested it for a while)

We'll see what happens when I test it with brcmfmac :-p

Gr. AvS

Re: [PATCH 3.11] cfg80211: fix P2P GO interface teardown

[Johannes Berg]

On Wed, 2013-07-31 at 21:19 +0200, Arend van Spriel wrote:
> On 07/31/2013 09:17 PM, Johannes Berg wrote:
> > On Wed, 2013-07-31 at 21:02 +0200, Johannes Berg wrote:
> >> From: Johannes Berg <johannes.berg@intel.com>
> >>
> >> When a P2P GO interface goes down, cfg80211 doesn't properly
> >> tear it down, leading to warnings later. Add the GO interface
> >> type to the enumeration to tear it down like AP interfaces.
> >> Otherwise, we leave it pending and mac80211's state can get
> >> very confused, leading to warnings later.
> >
> > Applied
> >
> > (it's obvious and we've tested it for a while)
> 
> We'll see what happens when I test it with brcmfmac :-p

Do you even know how to test it? ;-)
Normally we don't go into this code path because wpa_supplicant will
properly clean up before removing the GO interface - we only saw it with
rfkill and/or doing 'ip link set wlan0-p2p-0 down' or so.

johannes