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

Commit 5a306f58 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: introduce IEEE80211_NUM_TIDS and use it 



Introduce IEEE80211_NUM_TIDS in the generic 802.11
header file and use it in place of STA_TID_NUM and
NUM_RX_DATA_QUEUES which are both really the number
of TIDs.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 0f927323

include/linux/ieee80211.h

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ 


#define IEEE80211_MAX_MESH_ID_LEN	32



#define IEEE80211_NUM_TIDS		16



#define IEEE80211_QOS_CTL_LEN		2

/* 1d tag mask */

#define IEEE80211_QOS_CTL_TAG1D_MASK		0x0007

net/mac80211/agg-rx.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ void ieee80211_stop_rx_ba_session(struct ieee80211_vif *vif, u16 ba_rx_bitmap, 
		return;

	}



	for (i = 0; i < STA_TID_NUM; i++)

	for (i = 0; i < IEEE80211_NUM_TIDS; i++)

		if (ba_rx_bitmap & BIT(i))

			set_bit(i, sta->ampdu_mlme.tid_rx_stop_requested);

net/mac80211/agg-tx.c

+6 −6
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, 
	if (WARN_ON(!local->ops->ampdu_action))

		return -EINVAL;



	if ((tid >= STA_TID_NUM) ||

	if ((tid >= IEEE80211_NUM_TIDS) ||

	    !(local->hw.flags & IEEE80211_HW_AMPDU_AGGREGATION) ||

	    (local->hw.flags & IEEE80211_HW_TX_AMPDU_SETUP_IN_HW))

		return -EINVAL;
@@ -605,9 +605,9 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid) 


	trace_api_start_tx_ba_cb(sdata, ra, tid);



	if (tid >= STA_TID_NUM) {

	if (tid >= IEEE80211_NUM_TIDS) {

		ht_dbg(sdata, "Bad TID value: tid = %d (>= %d)\n",

		       tid, STA_TID_NUM);

		       tid, IEEE80211_NUM_TIDS);

		return;

	}
@@ -687,7 +687,7 @@ int ieee80211_stop_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid) 
	if (!local->ops->ampdu_action)

		return -EINVAL;



	if (tid >= STA_TID_NUM)

	if (tid >= IEEE80211_NUM_TIDS)

		return -EINVAL;



	spin_lock_bh(&sta->lock);
@@ -722,9 +722,9 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid) 


	trace_api_stop_tx_ba_cb(sdata, ra, tid);



	if (tid >= STA_TID_NUM) {

	if (tid >= IEEE80211_NUM_TIDS) {

		ht_dbg(sdata, "Bad TID value: tid = %d (>= %d)\n",

		       tid, STA_TID_NUM);

		       tid, IEEE80211_NUM_TIDS);

		return;

	}

net/mac80211/debugfs_key.c

+3 −3
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static ssize_t key_rx_spec_read(struct file *file, char __user *userbuf, 
				size_t count, loff_t *ppos)

{

	struct ieee80211_key *key = file->private_data;

	char buf[14*NUM_RX_DATA_QUEUES+1], *p = buf;

	char buf[14*IEEE80211_NUM_TIDS+1], *p = buf;

	int i, len;

	const u8 *rpn;
@@ -126,7 +126,7 @@ static ssize_t key_rx_spec_read(struct file *file, char __user *userbuf, 
		len = scnprintf(buf, sizeof(buf), "\n");

		break;

	case WLAN_CIPHER_SUITE_TKIP:

		for (i = 0; i < NUM_RX_DATA_QUEUES; i++)

		for (i = 0; i < IEEE80211_NUM_TIDS; i++)

			p += scnprintf(p, sizeof(buf)+buf-p,

				       "%08x %04x\n",

				       key->u.tkip.rx[i].iv32,
@@ -134,7 +134,7 @@ static ssize_t key_rx_spec_read(struct file *file, char __user *userbuf, 
		len = p - buf;

		break;

	case WLAN_CIPHER_SUITE_CCMP:

		for (i = 0; i < NUM_RX_DATA_QUEUES + 1; i++) {

		for (i = 0; i < IEEE80211_NUM_TIDS + 1; i++) {

			rpn = key->u.ccmp.rx_pn[i];

			p += scnprintf(p, sizeof(buf)+buf-p,

				       "%02x%02x%02x%02x%02x%02x\n",

net/mac80211/debugfs_sta.c

+5 −5
Original line number Diff line number Diff line
@@ -131,10 +131,10 @@ STA_OPS(connected_time); 
static ssize_t sta_last_seq_ctrl_read(struct file *file, char __user *userbuf,

				      size_t count, loff_t *ppos)

{

	char buf[15*NUM_RX_DATA_QUEUES], *p = buf;

	char buf[15*IEEE80211_NUM_TIDS], *p = buf;

	int i;

	struct sta_info *sta = file->private_data;

	for (i = 0; i < NUM_RX_DATA_QUEUES; i++)

	for (i = 0; i < IEEE80211_NUM_TIDS; i++)

		p += scnprintf(p, sizeof(buf)+buf-p, "%x ",

			       le16_to_cpu(sta->last_seq_ctrl[i]));

	p += scnprintf(p, sizeof(buf)+buf-p, "\n");
@@ -145,7 +145,7 @@ STA_OPS(last_seq_ctrl); 
static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf,

					size_t count, loff_t *ppos)

{

	char buf[71 + STA_TID_NUM * 40], *p = buf;

	char buf[71 + IEEE80211_NUM_TIDS * 40], *p = buf;

	int i;

	struct sta_info *sta = file->private_data;

	struct tid_ampdu_rx *tid_rx;
@@ -158,7 +158,7 @@ static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf, 
	p += scnprintf(p, sizeof(buf) + buf - p,

		       "TID\t\tRX active\tDTKN\tSSN\t\tTX\tDTKN\tpending\n");



	for (i = 0; i < STA_TID_NUM; i++) {

	for (i = 0; i < IEEE80211_NUM_TIDS; i++) {

		tid_rx = rcu_dereference(sta->ampdu_mlme.tid_rx[i]);

		tid_tx = rcu_dereference(sta->ampdu_mlme.tid_tx[i]);
@@ -220,7 +220,7 @@ static ssize_t sta_agg_status_write(struct file *file, const char __user *userbu 


	tid = simple_strtoul(buf, NULL, 0);



	if (tid >= STA_TID_NUM)

	if (tid >= IEEE80211_NUM_TIDS)

		return -EINVAL;



	if (tx) {