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

Commit fcea6007 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: move plink state 



For some odd reason, the plink_state enum is
declared in the middle between aggregation
related structures. Move it down to make the
file easier to read.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 08daecae

net/mac80211/sta_info.h

+22 −22
Original line number Diff line number Diff line
@@ -119,6 +119,28 @@ struct tid_ampdu_rx { 
	u8 dialog_token;

};



/**

 * struct sta_ampdu_mlme - STA aggregation information.

 *

 * @tid_active_rx: TID's state in Rx session state machine.

 * @tid_rx: aggregation info for Rx per TID

 * @tid_state_tx: TID's state in Tx session state machine.

 * @tid_tx: aggregation info for Tx per TID

 * @addba_req_num: number of times addBA request has been sent.

 * @dialog_token_allocator: dialog token enumerator for each new session;

 */

struct sta_ampdu_mlme {

	/* rx */

	bool tid_active_rx[STA_TID_NUM];

	struct tid_ampdu_rx *tid_rx[STA_TID_NUM];

	/* tx */

	u8 tid_state_tx[STA_TID_NUM];

	struct tid_ampdu_tx *tid_tx[STA_TID_NUM];

	u8 addba_req_num[STA_TID_NUM];

	u8 dialog_token_allocator;

};





/**

 * enum plink_state - state of a mesh peer link finite state machine

 *
@@ -142,28 +164,6 @@ enum plink_state { 
	PLINK_BLOCKED

};



/**

 * struct sta_ampdu_mlme - STA aggregation information.

 *

 * @tid_active_rx: TID's state in Rx session state machine.

 * @tid_rx: aggregation info for Rx per TID

 * @tid_state_tx: TID's state in Tx session state machine.

 * @tid_tx: aggregation info for Tx per TID

 * @addba_req_num: number of times addBA request has been sent.

 * @dialog_token_allocator: dialog token enumerator for each new session;

 */

struct sta_ampdu_mlme {

	/* rx */

	bool tid_active_rx[STA_TID_NUM];

	struct tid_ampdu_rx *tid_rx[STA_TID_NUM];

	/* tx */

	u8 tid_state_tx[STA_TID_NUM];

	struct tid_ampdu_tx *tid_tx[STA_TID_NUM];

	u8 addba_req_num[STA_TID_NUM];

	u8 dialog_token_allocator;

};





/**

 * struct sta_info - STA information

 *