Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf515fb1 authored by John W. Linville's avatar John W. Linville
Browse files

Merge tag 'mac80211-next-for-john-2014-11-04' of... 

Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg <johannes@sipsolutions.net> 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: default avatarJohn W. Linville <linville@tuxdriver.com>
parents 6bc6c49f cf2c92d8

drivers/net/wireless/ath/ath10k/core.h

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ enum ath10k_state { 
	 * stopped in ath10k_core_restart() work holding conf_mutex. The state

	 * RESTARTED means that the device is up and mac80211 has started hw

	 * reconfiguration. Once mac80211 is done with the reconfiguration we

	 * set the state to STATE_ON in restart_complete(). */

	 * set the state to STATE_ON in reconfig_complete(). */

	ATH10K_STATE_RESTARTING,

	ATH10K_STATE_RESTARTED,

drivers/net/wireless/ath/ath10k/mac.c

+6 −2
Original line number Diff line number Diff line
@@ -3994,10 +3994,14 @@ static int ath10k_resume(struct ieee80211_hw *hw) 
}

#endif



static void ath10k_restart_complete(struct ieee80211_hw *hw)

static void ath10k_reconfig_complete(struct ieee80211_hw *hw,

				     enum ieee80211_reconfig_type reconfig_type)

{

	struct ath10k *ar = hw->priv;



	if (reconfig_type != IEEE80211_RECONFIG_TYPE_RESTART)

		return;



	mutex_lock(&ar->conf_mutex);



	/* If device failed to restart it will be in a different state, e.g.
@@ -4515,7 +4519,7 @@ static const struct ieee80211_ops ath10k_ops = { 
	.tx_last_beacon			= ath10k_tx_last_beacon,

	.set_antenna			= ath10k_set_antenna,

	.get_antenna			= ath10k_get_antenna,

	.restart_complete		= ath10k_restart_complete,

	.reconfig_complete		= ath10k_reconfig_complete,

	.get_survey			= ath10k_get_survey,

	.set_bitrate_mask		= ath10k_set_bitrate_mask,

	.sta_rc_update			= ath10k_sta_rc_update,

drivers/net/wireless/ath/ath6kl/cfg80211.c

+2 −2
Original line number Diff line number Diff line
@@ -2976,11 +2976,11 @@ static int ath6kl_stop_ap(struct wiphy *wiphy, struct net_device *dev) 
static const u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };



static int ath6kl_del_station(struct wiphy *wiphy, struct net_device *dev,

			      const u8 *mac)

			      struct station_del_parameters *params)

{

	struct ath6kl *ar = ath6kl_priv(dev);

	struct ath6kl_vif *vif = netdev_priv(dev);

	const u8 *addr = mac ? mac : bcast_addr;

	const u8 *addr = params->mac ? params->mac : bcast_addr;



	return ath6kl_wmi_ap_set_mlme(ar->wmi, vif->fw_vif_idx, WMI_AP_DEAUTH,

				      addr, WLAN_REASON_PREV_AUTH_NOT_VALID);

drivers/net/wireless/ath/wil6210/cfg80211.c

+3 −2
Original line number Diff line number Diff line
@@ -792,12 +792,13 @@ static int wil_cfg80211_stop_ap(struct wiphy *wiphy, 
}



static int wil_cfg80211_del_station(struct wiphy *wiphy,

				    struct net_device *dev, const u8 *mac)

				    struct net_device *dev,

				    struct station_del_parameters *params)

{

	struct wil6210_priv *wil = wiphy_to_wil(wiphy);



	mutex_lock(&wil->mutex);

	wil6210_disconnect(wil, mac, false);

	wil6210_disconnect(wil, params->mac, false);

	mutex_unlock(&wil->mutex);



	return 0;

drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c

+4 −4
Original line number Diff line number Diff line
@@ -4045,24 +4045,24 @@ brcmf_cfg80211_change_beacon(struct wiphy *wiphy, struct net_device *ndev, 


static int

brcmf_cfg80211_del_station(struct wiphy *wiphy, struct net_device *ndev,

			   const u8 *mac)

			   struct station_del_parameters *params)

{

	struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);

	struct brcmf_scb_val_le scbval;

	struct brcmf_if *ifp = netdev_priv(ndev);

	s32 err;



	if (!mac)

	if (!params->mac)

		return -EFAULT;



	brcmf_dbg(TRACE, "Enter %pM\n", mac);

	brcmf_dbg(TRACE, "Enter %pM\n", params->mac);



	if (ifp->vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif)

		ifp = cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY].vif->ifp;

	if (!check_vif_up(ifp->vif))

		return -EIO;



	memcpy(&scbval.ea, mac, ETH_ALEN);

	memcpy(&scbval.ea, params->mac, ETH_ALEN);

	scbval.val = cpu_to_le32(WLAN_REASON_DEAUTH_LEAVING);

	err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SCB_DEAUTHENTICATE_FOR_REASON,

				     &scbval, sizeof(scbval));