cfg80211: clean up properly on interface type change

When the interface type changes while connected, and the
driver does not require the interface to be down for a
type change, it is currently possible to get very strange
results unless the driver takes special care, which it
shouldn't have to.

To fix this, take care to disconnect/leave IBSS when
changing the interface type -- even if the driver may fail
the call. Also process all events that may be pending to
avoid running into a situation where an event is reported
but only processed after the type has already changed,
which would lead to missing events and warnings.

A side effect of this is that you will have disconnected
or left the IBSS even if the mode change ultimately fails,
but since the intention was to change it and thus leave or
disconnect, this is not a problem.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 1 insertions, 15 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index a8aaadeb6773..71bfc044a939 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -977,12 +977,6 @@ static int nl80211_set_interface(struct sk_buff *skb, struct genl_info *info)
                 }
         }
 
-        if (!rdev->ops->change_virtual_intf ||
-            !(rdev->wiphy.interface_modes & (1 << ntype))) {
-                err = -EOPNOTSUPP;
-                goto unlock;
-        }
-
         if (info->attrs[NL80211_ATTR_MESH_ID]) {
                 if (ntype != NL80211_IFTYPE_MESH_POINT) {
                         err = -EINVAL;
@@ -1008,18 +1002,10 @@ static int nl80211_set_interface(struct sk_buff *skb, struct genl_info *info)
         }
 
         if (change)
-                err = rdev->ops->change_virtual_intf(&rdev->wiphy, dev,
-                                                    ntype, flags, &params);
+                err = cfg80211_change_iface(rdev, dev, ntype, flags, &params);
         else
                 err = 0;
 
-        WARN_ON(!err && dev->ieee80211_ptr->iftype != ntype);
-
-        if (!err && (ntype != otype)) {
-                if (otype == NL80211_IFTYPE_ADHOC)
-                        cfg80211_clear_ibss(dev, false);
-        }
-
  unlock:
         dev_put(dev);
         cfg80211_unlock_rdev(rdev);