diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-09-04 19:41:33 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-09-04 19:41:33 +0200 |
| commit | ef4ead3f29256ed83991cd77b39334aadd25672a (patch) | |
| tree | a164b021488a7b1dc869c093886cada1ff07fde4 /drivers/net/wireless/mwifiex/cfg80211.c | |
| parent | carl9170: tx: Replace rcu_assign_pointer() with RCU_INIT_POINTER() (diff) | |
| parent | net: rfkill: gpio: Add more Broadcom bluetooth ACPI IDs (diff) | |
| download | linux-ef4ead3f29256ed83991cd77b39334aadd25672a.tar.xz linux-ef4ead3f29256ed83991cd77b39334aadd25672a.zip | |
Merge tag 'mac80211-next-for-john-2014-08-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg <johannes@sipsolutions.net> says:
"Not that much content this time. Some RCU cleanups, crypto
performance improvements, and various patches all over,
rather than listing them one might as well look into the
git log instead."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Conflicts:
drivers/net/wireless/ath/wil6210/wmi.c
Diffstat (limited to 'drivers/net/wireless/mwifiex/cfg80211.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/cfg80211.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index 2856f0ecb8fc..c4723b0f5757 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c @@ -1557,6 +1557,7 @@ static int mwifiex_cfg80211_inform_ibss_bss(struct mwifiex_private *priv) band)); bss = cfg80211_inform_bss(priv->wdev->wiphy, chan, + CFG80211_BSS_FTYPE_UNKNOWN, bss_info.bssid, 0, WLAN_CAPABILITY_IBSS, 0, ie_buf, ie_len, 0, GFP_KERNEL); cfg80211_put_bss(priv->wdev->wiphy, bss); |