From: John W. Linville Date: Tue, 4 Nov 2014 21:18:12 +0000 (-0500) Subject: Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: v4.14-rc1~6335^2~28^2~126 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf515fb11ab539c76d04f0e3c5216ed41f41d81f;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'mac80211-next-for-john-2014-11-04' of git://git./linux/kernel/git/jberg/mac80211-next Johannes Berg says: "This relatively large batch of changes is comprised of the following: * large mac80211-hwsim changes from Ben, Jukka and a bit myself * OCB/WAVE/11p support from Rostislav on behalf of the Czech Technical University in Prague and Volkswagen Group Research * minstrel VHT work from Karl * more CSA work from Luca * WMM admission control support in mac80211 (myself) * various smaller fixes, spelling corrections, and minor API additions" Conflicts: drivers/net/wireless/ath/wil6210/cfg80211.c Signed-off-by: John W. Linville --- bf515fb11ab539c76d04f0e3c5216ed41f41d81f diff --cc drivers/net/wireless/ath/wil6210/cfg80211.c index 4248fb3,8fdfa32..0fc0b9f --- a/drivers/net/wireless/ath/wil6210/cfg80211.c +++ b/drivers/net/wireless/ath/wil6210/cfg80211.c @@@ -797,7 -798,7 +798,7 @@@ static int wil_cfg80211_del_station(str struct wil6210_priv *wil = wiphy_to_wil(wiphy); mutex_lock(&wil->mutex); - wil6210_disconnect(wil, mac, false); - wil6210_disconnect(wil, params->mac); ++ wil6210_disconnect(wil, params->mac, false); mutex_unlock(&wil->mutex); return 0;