diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-07-17 15:39:38 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-07-17 15:39:41 +0200 |
| commit | 72bbe3d1c2d7a9e257956912040ffc7ba9f71e0d (patch) | |
| tree | 8f014bc8663c3e0eec3250ceb46ca18674e8932a /net/mac80211/tdls.c | |
| parent | mac80211: Add support for declaring MU-MIMO capability (diff) | |
| parent | cfg80211: use RTNL locked reg_can_beacon for IR-relaxation (diff) | |
| download | linux-72bbe3d1c2d7a9e257956912040ffc7ba9f71e0d.tar.xz linux-72bbe3d1c2d7a9e257956912040ffc7ba9f71e0d.zip | |
Merge branch 'mac80211' into mac80211-next
This is necessary to merge the new TDLS and mesh patches,
as they depend on some fixes.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/tdls.c')
| -rw-r--r-- | net/mac80211/tdls.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/tdls.c b/net/mac80211/tdls.c index 8536789da17d..20c9dbde3b2b 100644 --- a/net/mac80211/tdls.c +++ b/net/mac80211/tdls.c @@ -69,6 +69,7 @@ ieee80211_tdls_add_subband(struct ieee80211_sub_if_data *sdata, struct ieee80211_channel *ch; struct cfg80211_chan_def chandef; int i, subband_start; + struct wiphy *wiphy = sdata->local->hw.wiphy; for (i = start; i <= end; i += spacing) { if (!ch_cnt) @@ -79,9 +80,8 @@ ieee80211_tdls_add_subband(struct ieee80211_sub_if_data *sdata, /* we will be active on the channel */ cfg80211_chandef_create(&chandef, ch, NL80211_CHAN_NO_HT); - if (cfg80211_reg_can_beacon(sdata->local->hw.wiphy, - &chandef, - sdata->wdev.iftype)) { + if (cfg80211_reg_can_beacon_relax(wiphy, &chandef, + sdata->wdev.iftype)) { ch_cnt++; /* * check if the next channel is also part of |