diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-07-09 16:40:36 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-07-14 22:30:07 +0400 |
| commit | f3947e2dfa3b18f375b7acd03b7ee2877d0751fc (patch) | |
| tree | 3f68e55a214e638f1210883958d0746610c9dcf8 /net/mac80211/cfg.c | |
| parent | 75636525fbfa78fa33fd754c89785cfde750acd3 (diff) | |
| download | linux-f3947e2dfa3b18f375b7acd03b7ee2877d0751fc.tar.xz | |
mac80211: push interface checks down
This patch pushes the "netif_running()" and "same type as before"
checks down into ieee80211_if_change_type() to centralise the
logic instead of duplicating it for cfg80211 and wext.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 6aa49ad172aa..ea0301025c15 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -84,22 +84,22 @@ static int ieee80211_change_iface(struct wiphy *wiphy, int ifindex, struct net_device *dev; enum ieee80211_if_types itype; struct ieee80211_sub_if_data *sdata; + int ret; /* we're under RTNL */ dev = __dev_get_by_index(&init_net, ifindex); if (!dev) return -ENODEV; - if (netif_running(dev)) - return -EBUSY; - itype = nl80211_type_to_mac80211_type(type); if (itype == IEEE80211_IF_TYPE_INVALID) return -EINVAL; sdata = IEEE80211_DEV_TO_SUB_IF(dev); - ieee80211_if_change_type(sdata, itype); + ret = ieee80211_if_change_type(sdata, itype); + if (ret) + return ret; if (ieee80211_vif_is_mesh(&sdata->vif) && params->mesh_id_len) ieee80211_if_sta_set_mesh_id(&sdata->u.sta, |