diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-03-31 16:39:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-31 16:39:04 -0400 |
| commit | 7b6249bba940f57c20cdde793b306ca3831778c7 (patch) | |
| tree | 24caf2ec9ea6fca08fe225228614807d0919b4b2 /net/wireless/ibss.c | |
| parent | net: rename dev to orig_dev in deliver_ptype_list_skb (diff) | |
| parent | mac80211: set QoS capability before changing station state (diff) | |
| download | linux-dev-7b6249bba940f57c20cdde793b306ca3831778c7.tar.xz linux-dev-7b6249bba940f57c20cdde793b306ca3831778c7.zip | |
Merge tag 'mac80211-next-for-davem-2015-03-30' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Lots of updates for net-next; along with the usual flurry
of small fixes, cleanups and internal features we have:
* VHT support for TDLS and IBSS (conditional on drivers though)
* first TX performance improvements (the biggest will come later)
* many suspend/resume (race) fixes
* name_assign_type support from Tom Gundersen
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/ibss.c')
| -rw-r--r-- | net/wireless/ibss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c index 6309b9c0bcd5..4c55fab9b4e4 100644 --- a/net/wireless/ibss.c +++ b/net/wireless/ibss.c @@ -30,7 +30,7 @@ void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, return; bss = cfg80211_get_bss(wdev->wiphy, channel, bssid, NULL, 0, - WLAN_CAPABILITY_IBSS, WLAN_CAPABILITY_IBSS); + IEEE80211_BSS_TYPE_IBSS, IEEE80211_PRIVACY_ANY); if (WARN_ON(!bss)) return; |