History

Kalle Valo says:

==================== pull-request: wireless-next-2022-10-28 First set of patches v6.2. mac80211 refactoring continues for Wi-Fi 7. All mac80211 driver are now converted to use internal TX queues, this might cause some regressions so we wanted to do this early in the cycle. Note: wireless tree was merged[1] to wireless-next to avoid some conflicts with mac80211 patches between the trees. Unfortunately there are still two smaller conflicts in net/mac80211/util.c which Stephen also reported[2]. In the first conflict initialise scratch_len to "params->scratch_len ?: 3 * params->len" (note number 3, not 2!) and in the second conflict take the version which uses elems->scratch_pos. [1] https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git/commit/?id=dfd2d876b3fda1790bc0239ba4c6967e25d16e91 [2] https://lore.kernel.org/all/20221020032340.5cf101c0@canb.auug.org.au/ mac80211 - preparation for Wi-Fi 7 Multi-Link Operation (MLO) continues - add API to show the link STAs in debugfs - all mac80211 drivers are now using mac80211 internal TX queues (iTXQs) rtw89 - support 8852BE rtl8xxxu - support RTL8188FU brmfmac - support two station interfaces concurrently bcma - support SPROM rev 11 ====================

Jakub Kicinski committed 4 years ago

Commit 196dd922 parents f8f797f 80e5acb122 files · +35581 −1106Browse files

Showing the changes to include/uapi (1 of 122 files). Show all

Unified · Split

include/uapi/linux/nl80211.h+3−0
@@ -2749,6 +2749,8 @@ enum nl80211_commands { · 2748 unmodified lines
2749 * When used with %NL80211_CMD_FRAME_TX_STATUS, indicates the ack RX2749 * When used with %NL80211_CMD_FRAME_TX_STATUS, indicates the ack RX
2750 * timestamp. When used with %NL80211_CMD_FRAME RX notification, indicates2750 * timestamp. When used with %NL80211_CMD_FRAME RX notification, indicates
2751 * the incoming frame RX timestamp.2751 * the incoming frame RX timestamp.
2752 * @NL80211_ATTR_TD_BITMAP: Transition Disable bitmap, for subsequent
2753 * (re)associations.
2752 * @NUM_NL80211_ATTR: total number of nl80211_attrs available2754 * @NUM_NL80211_ATTR: total number of nl80211_attrs available
2753 * @NL80211_ATTR_MAX: highest attribute number currently defined2755 * @NL80211_ATTR_MAX: highest attribute number currently defined
2754 * @__NL80211_ATTR_AFTER_LAST: internal use2756 * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -3276,6 +3278,7 @@ enum nl80211_attrs { · 521 unmodified lines
3276 3278
3277 NL80211_ATTR_TX_HW_TIMESTAMP,3279 NL80211_ATTR_TX_HW_TIMESTAMP,
3278 NL80211_ATTR_RX_HW_TIMESTAMP,3280 NL80211_ATTR_RX_HW_TIMESTAMP,
3281 NL80211_ATTR_TD_BITMAP,
3279 3282
3280 /* add attributes here, update the policy in nl80211.c */3283 /* add attributes here, update the policy in nl80211.c */
3281 3284