Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

Helmut Schaa and committed by
John W. Linville
c1407b6c 2a190322

+6 -4
+5 -3
include/linux/ieee80211.h
··· 816 816 } __attribute__((packed)); 817 817 818 818 /* 802.11 BAR control masks */ 819 - #define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL 0x0000 820 - #define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA 0x0004 821 - 819 + #define IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL 0x0000 820 + #define IEEE80211_BAR_CTRL_MULTI_TID 0x0002 821 + #define IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA 0x0004 822 + #define IEEE80211_BAR_CTRL_TID_INFO_MASK 0xf000 823 + #define IEEE80211_BAR_CTRL_TID_INFO_SHIFT 12 822 824 823 825 #define IEEE80211_HT_MCS_MASK_LEN 10 824 826
+1 -1
net/mac80211/agg-tx.c
··· 128 128 memcpy(bar->ta, sdata->vif.addr, ETH_ALEN); 129 129 bar_control |= (u16)IEEE80211_BAR_CTRL_ACK_POLICY_NORMAL; 130 130 bar_control |= (u16)IEEE80211_BAR_CTRL_CBMTID_COMPRESSED_BA; 131 - bar_control |= (u16)(tid << 12); 131 + bar_control |= (u16)(tid << IEEE80211_BAR_CTRL_TID_INFO_SHIFT); 132 132 bar->control = cpu_to_le16(bar_control); 133 133 bar->start_seq_num = cpu_to_le16(ssn); 134 134