Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless (6fe5468f) · Commits · 方亚芬 / linux

drivers/net/wireless/ath/ath9k/main.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -280,6 +280,10 @@ static int ath_reset_internal(struct ath_softc sc, struct ath9k_channel hchan)
		if (r) {
		ath_err(common,
		"Unable to reset channel, reset status %d\n", r);

		ath9k_hw_enable_interrupts(ah);
		ath9k_queue_reset(sc, RESET_TYPE_BB_HANG);

		goto out;
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -3303,15 +3303,15 @@ static int _brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus)
		goto err;
		}

		/* External image takes precedence if specified */
		if (brcmf_sdbrcm_download_code_file(bus)) {
		brcmf_err("dongle image file download failed\n");
		goto err;
		}

		/* External nvram takes precedence if specified */
		if (brcmf_sdbrcm_download_nvram(bus))
		if (brcmf_sdbrcm_download_nvram(bus)) {
		brcmf_err("dongle nvram file download failed\n");
		goto err;
		}

		/* Take arm out of reset */
		if (brcmf_sdbrcm_download_state(bus, false)) {

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

+25 −21

Original line number	Diff line number	Diff line
		@@ -1844,8 +1844,10 @@ static s32
		brcmf_add_keyext(struct wiphy wiphy, struct net_device ndev,
		u8 key_idx, const u8 mac_addr, struct key_params params)
		{
		struct brcmf_if *ifp = netdev_priv(ndev);
		struct brcmf_wsec_key key;
		s32 err = 0;
		u8 keybuf[8];

		memset(&key, 0, sizeof(key));
		key.index = (u32) key_idx;
		@@ -1869,8 +1871,9 @@ brcmf_add_keyext(struct wiphy wiphy, struct net_device ndev,
		brcmf_dbg(CONN, "Setting the key index %d\n", key.index);
		memcpy(key.data, params->key, key.len);

		if (params->cipher == WLAN_CIPHER_SUITE_TKIP) {
		u8 keybuf[8];
		if ((ifp->vif->mode != WL_MODE_AP) &&
		(params->cipher == WLAN_CIPHER_SUITE_TKIP)) {
		brcmf_dbg(CONN, "Swapping RX/TX MIC key\n");
		memcpy(keybuf, &key.data[24], sizeof(keybuf));
		memcpy(&key.data[24], &key.data[16], sizeof(keybuf));
		memcpy(&key.data[16], keybuf, sizeof(keybuf));
		@@ -1966,7 +1969,7 @@ brcmf_cfg80211_add_key(struct wiphy wiphy, struct net_device ndev,
		break;
		case WLAN_CIPHER_SUITE_TKIP:
		if (ifp->vif->mode != WL_MODE_AP) {
		brcmf_dbg(CONN, "Swapping key\n");
		brcmf_dbg(CONN, "Swapping RX/TX MIC key\n");
		memcpy(keybuf, &key.data[24], sizeof(keybuf));
		memcpy(&key.data[24], &key.data[16], sizeof(keybuf));
		memcpy(&key.data[16], keybuf, sizeof(keybuf));
		@@ -2071,8 +2074,7 @@ brcmf_cfg80211_get_key(struct wiphy wiphy, struct net_device ndev,
		err = -EAGAIN;
		goto done;
		}
		switch (wsec & ~SES_OW_ENABLED) {
		case WEP_ENABLED:
		if (wsec & WEP_ENABLED) {
		sec = &profile->sec;
		if (sec->cipher_pairwise & WLAN_CIPHER_SUITE_WEP40) {
		params.cipher = WLAN_CIPHER_SUITE_WEP40;
		@@ -2081,16 +2083,13 @@ brcmf_cfg80211_get_key(struct wiphy wiphy, struct net_device ndev,
		params.cipher = WLAN_CIPHER_SUITE_WEP104;
		brcmf_dbg(CONN, "WLAN_CIPHER_SUITE_WEP104\n");
		}
		break;
		case TKIP_ENABLED:
		} else if (wsec & TKIP_ENABLED) {
		params.cipher = WLAN_CIPHER_SUITE_TKIP;
		brcmf_dbg(CONN, "WLAN_CIPHER_SUITE_TKIP\n");
		break;
		case AES_ENABLED:
		} else if (wsec & AES_ENABLED) {
		params.cipher = WLAN_CIPHER_SUITE_AES_CMAC;
		brcmf_dbg(CONN, "WLAN_CIPHER_SUITE_AES_CMAC\n");
		break;
		default:
		} else {
		brcmf_err("Invalid algo (0x%x)\n", wsec);
		err = -EINVAL;
		goto done;
		@@ -3774,8 +3773,9 @@ brcmf_cfg80211_start_ap(struct wiphy wiphy, struct net_device ndev,
		static int brcmf_cfg80211_stop_ap(struct wiphy wiphy, struct net_device ndev)
		{
		struct brcmf_if *ifp = netdev_priv(ndev);
		s32 err = -EPERM;
		s32 err;
		struct brcmf_fil_bss_enable_le bss_enable;
		struct brcmf_join_params join_params;

		brcmf_dbg(TRACE, "Enter\n");

		@@ -3783,16 +3783,21 @@ static int brcmf_cfg80211_stop_ap(struct wiphy wiphy, struct net_device ndev)
		/* Due to most likely deauths outstanding we sleep */
		/* first to make sure they get processed by fw. */
		msleep(400);
		err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_AP, 0);
		if (err < 0) {
		brcmf_err("setting AP mode failed %d\n", err);
		goto exit;
		}

		memset(&join_params, 0, sizeof(join_params));
		err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
		&join_params, sizeof(join_params));
		if (err < 0)
		brcmf_err("SET SSID error (%d)\n", err);
		err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 0);
		if (err < 0) {
		if (err < 0)
		brcmf_err("BRCMF_C_UP error %d\n", err);
		goto exit;
		}
		err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_AP, 0);
		if (err < 0)
		brcmf_err("setting AP mode failed %d\n", err);
		err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_INFRA, 0);
		if (err < 0)
		brcmf_err("setting INFRA mode failed %d\n", err);
		} else {
		bss_enable.bsscfg_idx = cpu_to_le32(ifp->bssidx);
		bss_enable.enable = cpu_to_le32(0);
		@@ -3805,7 +3810,6 @@ static int brcmf_cfg80211_stop_ap(struct wiphy wiphy, struct net_device ndev)
		set_bit(BRCMF_VIF_STATUS_AP_CREATING, &ifp->vif->sme_state);
		clear_bit(BRCMF_VIF_STATUS_AP_CREATED, &ifp->vif->sme_state);

		exit:
		return err;
		}

drivers/net/wireless/iwlwifi/dvm/rxon.c

+8 −10

Original line number	Diff line number	Diff line
		@@ -1419,6 +1419,14 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,

		mutex_lock(&priv->mutex);

		if (changes & BSS_CHANGED_IDLE && bss_conf->idle) {
		/*
		* If we go idle, then clearly no "passive-no-rx"
		* workaround is needed any more, this is a reset.
		*/
		iwlagn_lift_passive_no_rx(priv);
		}

		if (unlikely(!iwl_is_ready(priv))) {
		IWL_DEBUG_MAC80211(priv, "leave - not ready\n");
		mutex_unlock(&priv->mutex);
		@@ -1450,16 +1458,6 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
		priv->timestamp = bss_conf->sync_tsf;
		ctx->staging.filter_flags \|= RXON_FILTER_ASSOC_MSK;
		} else {
		/*
		* If we disassociate while there are pending
		* frames, just wake up the queues and let the
		* frames "escape" ... This shouldn't really
		* be happening to start with, but we should
		* not get stuck in this case either since it
		* can happen if userspace gets confused.
		*/
		iwlagn_lift_passive_no_rx(priv);

		ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;

		if (ctx->ctxid == IWL_RXON_CTX_BSS)

drivers/net/wireless/iwlwifi/dvm/tx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1193,7 +1193,7 @@ int iwlagn_rx_reply_tx(struct iwl_priv priv, struct iwl_rx_cmd_buffer rxb,
		memset(&info->status, 0, sizeof(info->status));

		if (status == TX_STATUS_FAIL_PASSIVE_NO_RX &&
		iwl_is_associated_ctx(ctx) && ctx->vif &&
		ctx->vif &&
		ctx->vif->type == NL80211_IFTYPE_STATION) {
		/* block and stop all queues */
		priv->passive_no_rx = true;