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

Commit d47775c4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

parents 4f262acf 7f466cff

drivers/net/wireless/ath/carl9170/tx.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -1234,6 +1234,7 @@ static bool carl9170_tx_ps_drop(struct ar9170 *ar, struct sk_buff *skb) 
{

{

	struct ieee80211_sta *sta;

	struct ieee80211_sta *sta;

	struct carl9170_sta_info *sta_info;

	struct carl9170_sta_info *sta_info;

	struct ieee80211_tx_info *tx_info;





	rcu_read_lock();

	rcu_read_lock();

	sta = __carl9170_get_tx_sta(ar, skb);

	sta = __carl9170_get_tx_sta(ar, skb);
@@ -1241,16 +1242,18 @@ static bool carl9170_tx_ps_drop(struct ar9170 *ar, struct sk_buff *skb) 
		goto out_rcu;

		goto out_rcu;





	sta_info = (void *) sta->drv_priv;

	sta_info = (void *) sta->drv_priv;

	if (unlikely(sta_info->sleeping)) {

	tx_info = IEEE80211_SKB_CB(skb);

		struct ieee80211_tx_info *tx_info;





	if (unlikely(sta_info->sleeping) &&

	    !(tx_info->flags & (IEEE80211_TX_CTL_POLL_RESPONSE |

				IEEE80211_TX_CTL_CLEAR_PS_FILT))) {

		rcu_read_unlock();

		rcu_read_unlock();





		tx_info = IEEE80211_SKB_CB(skb);

		if (tx_info->flags & IEEE80211_TX_CTL_AMPDU)

		if (tx_info->flags & IEEE80211_TX_CTL_AMPDU)

			atomic_dec(&ar->tx_ampdu_upload);

			atomic_dec(&ar->tx_ampdu_upload);





		tx_info->flags |= IEEE80211_TX_STAT_TX_FILTERED;

		tx_info->flags |= IEEE80211_TX_STAT_TX_FILTERED;

		carl9170_release_dev_space(ar, skb);

		carl9170_tx_status(ar, skb, false);

		carl9170_tx_status(ar, skb, false);

		return true;

		return true;

	}

	}

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1240,7 +1240,7 @@ int iwlagn_suspend(struct iwl_priv *priv, 
				.flags = CMD_SYNC,

				.flags = CMD_SYNC,

				.data[0] = key_data.rsc_tsc,

				.data[0] = key_data.rsc_tsc,

				.dataflags[0] = IWL_HCMD_DFL_NOCOPY,

				.dataflags[0] = IWL_HCMD_DFL_NOCOPY,

				.len[0] = sizeof(key_data.rsc_tsc),

				.len[0] = sizeof(*key_data.rsc_tsc),

			};

			};





			ret = iwl_trans_send_cmd(trans(priv), &rsc_tsc_cmd);

			ret = iwl_trans_send_cmd(trans(priv), &rsc_tsc_cmd);

drivers/net/wireless/mwifiex/cfg80211.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -846,6 +846,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid, 
	priv->sec_info.wpa_enabled = false;

	priv->sec_info.wpa_enabled = false;

	priv->sec_info.wpa2_enabled = false;

	priv->sec_info.wpa2_enabled = false;

	priv->wep_key_curr_index = 0;

	priv->wep_key_curr_index = 0;

	priv->sec_info.encryption_mode = 0;

	ret = mwifiex_set_encode(priv, NULL, 0, 0, 1);

	ret = mwifiex_set_encode(priv, NULL, 0, 0, 1);





	if (mode == NL80211_IFTYPE_ADHOC) {

	if (mode == NL80211_IFTYPE_ADHOC) {