diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-13 18:05:40 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-13 18:05:40 (GMT) |
| commit | 1f7e0102820f11a0dcd3a2f90140abf14c894ba8 (patch) | |
| tree | 2ae08acbb26ddb2fa662db63c1dd111c0b5b646f /net/wireless/util.c | |
| parent | 6ddcd46463aa66855f1f8e74de454740a5f4aef4 (diff) | |
| parent | 79543d8eecc0957ac6fe3ec1e2486ad31d4b67a3 (diff) | |
| download | linux-fsl-qoriq-1f7e0102820f11a0dcd3a2f90140abf14c894ba8.tar.xz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/wireless/util.c')
| -rw-r--r-- | net/wireless/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 8f2d68f..316cfd0 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -804,7 +804,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev, ntype == NL80211_IFTYPE_P2P_CLIENT)) return -EBUSY; - if (ntype != otype) { + if (ntype != otype && netif_running(dev)) { err = cfg80211_can_change_interface(rdev, dev->ieee80211_ptr, ntype); if (err) |