diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-09 21:06:28 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-09 21:06:28 +0200 |
| commit | 4f0544489215fc78cccb96f8e3d0f078ae965297 (patch) | |
| tree | 69e71db0cf005a68ab1b70f33ae0462fd94152fc /net/wireless | |
| parent | ath9k: Add more PCI IDs for WB225 cards (diff) | |
| parent | cw1200: Fix spurious BUG_ON() trigger when starting AP mode. (diff) | |
| download | linux-4f0544489215fc78cccb96f8e3d0f078ae965297.tar.xz linux-4f0544489215fc78cccb96f8e3d0f078ae965297.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/core.c | 1 | ||||
| -rw-r--r-- | net/wireless/nl80211.c | 6 | ||||
| -rw-r--r-- | net/wireless/reg.c | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 389a3f2ee464..67153964aad2 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -774,6 +774,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: diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 160c1f7c6091..587ff843cf94 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -449,10 +449,12 @@ static int nl80211_prepare_wdev_dump(struct sk_buff *skb, goto out_unlock; } *rdev = wiphy_to_dev((*wdev)->wiphy); - cb->args[0] = (*rdev)->wiphy_idx; + /* 0 is the first index - add 1 to parse only once */ + cb->args[0] = (*rdev)->wiphy_idx + 1; cb->args[1] = (*wdev)->identifier; } else { - struct wiphy *wiphy = wiphy_idx_to_wiphy(cb->args[0]); + /* subtract the 1 again here */ + struct wiphy *wiphy = wiphy_idx_to_wiphy(cb->args[0] - 1); struct wireless_dev *tmp; if (!wiphy) { diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 5a950f36bae4..de06d5d1287f 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -2247,10 +2247,13 @@ int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env) void wiphy_regulatory_register(struct wiphy *wiphy) { + struct regulatory_request *lr; + if (!reg_dev_ignore_cell_hint(wiphy)) reg_num_devs_support_basehint++; - wiphy_update_regulatory(wiphy, NL80211_REGDOM_SET_BY_CORE); + lr = get_last_request(); + wiphy_update_regulatory(wiphy, lr->initiator); } void wiphy_regulatory_deregister(struct wiphy *wiphy) |