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

Commit c1407b6c authored by Helmut Schaa's avatar Helmut Schaa Committed by John W. Linville
Browse files

wireless: Introduce defines for BAR TID_INFO & MULTI_TID fields 



While at it also fix the indention of the other IEEE80211_BAR_CTRL_ defines.

Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2a190322

include/linux/ieee80211.h

+5 −3
Original line number Original line Diff line number Diff line
@@ -817,8 +817,10 @@ struct ieee80211_bar { 




/* 802.11 BAR control masks */

/* 802.11 BAR control masks */

#define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL	0x0000

#define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL	0x0000

#define IEEE80211_BAR_CTRL_MULTI_TID		0x0002

#define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA	0x0004

#define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA	0x0004



#define IEEE80211_BAR_CTRL_TID_INFO_MASK	0xf000

#define IEEE80211_BAR_CTRL_TID_INFO_SHIFT	12





#define IEEE80211_HT_MCS_MASK_LEN		10

#define IEEE80211_HT_MCS_MASK_LEN		10

net/mac80211/agg-tx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -128,7 +128,7 @@ void ieee80211_send_bar(struct ieee80211_sub_if_data *sdata, u8 *ra, u16 tid, u1 
	memcpy(bar->ta, sdata->vif.addr, ETH_ALEN);

	memcpy(bar->ta, sdata->vif.addr, ETH_ALEN);

	bar_control |= (u16)IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL;

	bar_control |= (u16)IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL;

	bar_control |= (u16)IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA;

	bar_control |= (u16)IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA;

	bar_control |= (u16)(tid << 12);

	bar_control |= (u16)(tid << IEEE80211_BAR_CTRL_TID_INFO_SHIFT);

	bar->control = cpu_to_le16(bar_control);

	bar->control = cpu_to_le16(bar_control);

	bar->start_seq_num = cpu_to_le16(ssn);

	bar->start_seq_num = cpu_to_le16(ssn);