diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-03-06 16:33:12 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-06 16:33:12 +0100 |
| commit | c0f3a317f2f0e51ad2f8809c83b137958b385c7f (patch) | |
| tree | c5547580ee6d47d01735124c6bd8ba1dfb70e206 /net/wireless/core.c | |
| parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) | |
| parent | 801d929ca7d935ee199fd61d8ef914f51e892270 (diff) | |
| download | linux-c0f3a317f2f0e51ad2f8809c83b137958b385c7f.tar.bz2 | |
Merge remote-tracking branch 'mac80211/master' into HEAD
There are a few things that would otherwise conflict.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 5ffff039b017..ea4155fe9733 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -367,8 +367,7 @@ struct wiphy *wiphy_new(const struct cfg80211_ops *ops, int sizeof_priv) rdev->wiphy.rts_threshold = (u32) -1; rdev->wiphy.coverage_class = 0; - rdev->wiphy.features = NL80211_FEATURE_SCAN_FLUSH | - NL80211_FEATURE_ADVERTISE_CHAN_LIMITS; + rdev->wiphy.features = NL80211_FEATURE_SCAN_FLUSH; return &rdev->wiphy; } |