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/ath/wil6210 | |
| 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/ath/wil6210')
| -rw-r--r-- | drivers/net/wireless/ath/wil6210/wmi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c index 1b64823544eb..b1aaaee997d5 100644 --- a/drivers/net/wireless/ath/wil6210/wmi.c +++ b/drivers/net/wireless/ath/wil6210/wmi.c @@ -351,11 +351,11 @@ static void wmi_evt_rx_mgmt(struct wil6210_priv *wil, int id, void *d, int len) rx_mgmt_frame->bssid); cfg80211_put_bss(wiphy, bss); } else { - wil_err(wil, "cfg80211_inform_bss() failed\n"); + wil_err(wil, "cfg80211_inform_bss_frame() failed\n"); } } else { cfg80211_rx_mgmt(wil->wdev, freq, signal, - (void *)rx_mgmt_frame, d_len, 0, GFP_ATOMIC); + (void *)rx_mgmt_frame, d_len, 0); } } |