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

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

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

parents 6fe7cc71 43c771a1

net/mac80211/cfg.c

+3 −0
Original line number Diff line number Diff line
@@ -2594,6 +2594,9 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy, 
		else

			local->probe_req_reg--;



		if (!local->open_count)

			break;



		ieee80211_queue_work(&local->hw, &local->reconfig_filter);

		break;

	default:

net/mac80211/ieee80211_i.h

+2 −0
Original line number Diff line number Diff line
@@ -1314,6 +1314,8 @@ netdev_tx_t ieee80211_monitor_start_xmit(struct sk_buff *skb, 
					 struct net_device *dev);

netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,

				       struct net_device *dev);

void ieee80211_purge_tx_queue(struct ieee80211_hw *hw,

			      struct sk_buff_head *skbs);



/* HT */

void ieee80211_apply_htcap_overrides(struct ieee80211_sub_if_data *sdata,

net/mac80211/main.c

+4 −2
Original line number Diff line number Diff line
@@ -871,8 +871,10 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 
				local->hw.wiphy->cipher_suites,

				sizeof(u32) * local->hw.wiphy->n_cipher_suites,

				GFP_KERNEL);

			if (!suites)

				return -ENOMEM;

			if (!suites) {

				result = -ENOMEM;

				goto fail_wiphy_register;

			}

			for (r = 0; r < local->hw.wiphy->n_cipher_suites; r++) {

				u32 suite = local->hw.wiphy->cipher_suites[r];

				if (suite == WLAN_CIPHER_SUITE_WEP40 ||

net/mac80211/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -917,7 +917,7 @@ int ieee80211_request_sched_scan_start(struct ieee80211_sub_if_data *sdata, 
				       struct cfg80211_sched_scan_request *req)

{

	struct ieee80211_local *local = sdata->local;

	struct ieee80211_sched_scan_ies sched_scan_ies;

	struct ieee80211_sched_scan_ies sched_scan_ies = {};

	int ret, i;



	mutex_lock(&local->mtx);

net/mac80211/sta_info.c

+8 −3
Original line number Diff line number Diff line
@@ -117,8 +117,8 @@ static void free_sta_work(struct work_struct *wk) 


	for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {

		local->total_ps_buffered -= skb_queue_len(&sta->ps_tx_buf[ac]);

		__skb_queue_purge(&sta->ps_tx_buf[ac]);

		__skb_queue_purge(&sta->tx_filtered[ac]);

		ieee80211_purge_tx_queue(&local->hw, &sta->ps_tx_buf[ac]);

		ieee80211_purge_tx_queue(&local->hw, &sta->tx_filtered[ac]);

	}



#ifdef CONFIG_MAC80211_MESH
@@ -141,7 +141,7 @@ static void free_sta_work(struct work_struct *wk) 
		tid_tx = rcu_dereference_raw(sta->ampdu_mlme.tid_tx[i]);

		if (!tid_tx)

			continue;

		__skb_queue_purge(&tid_tx->pending);

		ieee80211_purge_tx_queue(&local->hw, &tid_tx->pending);

		kfree(tid_tx);

	}
@@ -961,6 +961,7 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta) 
	struct ieee80211_local *local = sdata->local;

	struct sk_buff_head pending;

	int filtered = 0, buffered = 0, ac;

	unsigned long flags;



	clear_sta_flag(sta, WLAN_STA_SP);
@@ -976,12 +977,16 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta) 
	for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {

		int count = skb_queue_len(&pending), tmp;



		spin_lock_irqsave(&sta->tx_filtered[ac].lock, flags);

		skb_queue_splice_tail_init(&sta->tx_filtered[ac], &pending);

		spin_unlock_irqrestore(&sta->tx_filtered[ac].lock, flags);

		tmp = skb_queue_len(&pending);

		filtered += tmp - count;

		count = tmp;



		spin_lock_irqsave(&sta->ps_tx_buf[ac].lock, flags);

		skb_queue_splice_tail_init(&sta->ps_tx_buf[ac], &pending);

		spin_unlock_irqrestore(&sta->ps_tx_buf[ac].lock, flags);

		tmp = skb_queue_len(&pending);

		buffered += tmp - count;

	}