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

Commit 24709182 authored by Ron Rindjunsky's avatar Ron Rindjunsky Committed by John W. Linville
Browse files

mac80211: fix wrong Rx A-MPDU control via debugfs 



This patch eliminate the use of buf_size as a trigger in favor of a new
flag to control Rx A-MPDU sessions through debugfs

Signed-off-by: default avatarRon Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 775ea378

net/mac80211/debugfs_sta.c

+4 −2
Original line number Diff line number Diff line
@@ -230,11 +230,13 @@ static ssize_t sta_agg_status_write(struct file *file, 
			strcpy(state, "off ");

			ieee80211_sta_stop_rx_ba_session(dev, da, tid_num, 0,

					WLAN_REASON_QSTA_REQUIRE_SETUP);

			sta->ampdu_mlme.tid_rx[tid_num].buf_size = 0xFF;

			sta->ampdu_mlme.tid_rx[tid_num].state |=

					HT_AGG_STATE_DEBUGFS_CTL;

			tid_static_rx[tid_num] = 0;

		} else {

			strcpy(state, "on ");

			sta->ampdu_mlme.tid_rx[tid_num].buf_size = 0x00;

			sta->ampdu_mlme.tid_rx[tid_num].state &=

					~HT_AGG_STATE_DEBUGFS_CTL;

			tid_static_rx[tid_num] = 1;

		}

		printk(KERN_DEBUG "debugfs - try switching tid %u %s\n",

net/mac80211/sta_info.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ enum ieee80211_sta_info_flags { 
#define HT_AGG_STATE_OPERATIONAL	(HT_ADDBA_REQUESTED_MSK |	\

					 HT_ADDBA_DRV_READY_MSK |	\

					 HT_ADDBA_RECEIVED_MSK)

#define HT_AGG_STATE_DEBUGFS_CTL	BIT(7)



/**

 * struct tid_ampdu_tx - TID aggregation information (Tx).