Re: git: d0d291103519 - main - LinuxKPI: 802.11: rework handling of the special IEEE80211_NUM_TIDS queue

Hi.

This broke build with LINUXKPI_DEBUG_80211 defined.
Format string in printf() at line 3093 looks mis-matching with
parameters. Don't know which is intended, though.

Line No. in error log below differs as I've applied the patch you
requested before, set linuxkpi_debug_80211 to 0x12, define
LINUXKPI_DEBUG_80211, and #if 0 ... #endif for 3 parts.

Reverting the patch (so LINUXKPI_DEBUG_80211 is NOT defined) aloowed
build.


  === Quot error log ===

--- all_subdir_linuxkpi_wlan ---
./machine/pcpu_aux.h:59:20: note: expanded from macro 'curthread'
#define curthread               (__curthread())
                                ^
/usr/src/sys/compat/linuxkpi/common/src/linux_80211.c:3102:8: error:
format specifies type 'int' but the argument has type 'struct lkpi_sta
*' [-Werror,-Wformat] lsta, sta, ni, ni->ni_macaddr, ":", skb, ltxq,
^~~~ /usr/src/sys/compat/linuxkpi/common/src/linux_80211.c:3102:14:
error: format specifies type 'unsigned int' but the argument has type
'struct ieee80211_sta *' [-Werror,-Wformat] lsta, sta, ni,
ni->ni_macaddr, ":", skb, ltxq,
^~~ /usr/src/sys/compat/linuxkpi/common/src/linux_80211.c:3102:49:
error: format specifies type 'char *' but the argument has type 'struct
lkpi_txq *' [-Werror,-Wformat] lsta, sta, ni, ni->ni_macaddr, ":", skb,
ltxq, ^~~~
--- all_subdir_linux_common ---
Building /usr/obj/usr/src/amd64.amd64/sys/TEST18/modules/usr/src/sys/modules/linux_common/linux.o
--- all_subdir_linuxkpi_wlan ---
/usr/src/sys/compat/linuxkpi/common/src/linux_80211.c:3103:8: error:
format specifies type 'void *' but the argument has type
'uint32_t' (aka 'unsigned int') [-Werror,-Wformat]
skb_queue_len(&ltxq->skbq), ltxq->txq.ac,
^~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/src/sys/compat/linuxkpi/common/src/linux_80211.c:
3103:36: error: format specifies type 'void *' but the argument has
type 'int' [-Werror,-Wformat] skb_queue_len(&ltxq->skbq), ltxq->txq.ac,
^~~~~~~~~~~~ /usr/src/sys/compat/linuxkpi/common/src/linux_80211.c:
3100:31: error: more '%' conversions than data arguments
[-Werror,-Wformat-insufficient-args] "WAKE_TX_Q ac %d prio %u qmap
%u\n", ~^
--- all_subdir_linuxkpi ---
Building /usr/obj/usr/src/amd64.amd64/sys/TEST18/modules/usr/src/sys/modules/linuxkpi/linux_firmware.o
--- all_subdir_linuxkpi_wlan ---
7 errors generated.
--- all_subdir_mac_bsdextended ---
Building /usr/obj/usr/src/amd64.amd64/sys/TEST18/modules/usr/src/sys/modules/mac_bsdextended/mac_bsdextended.ko.full
--- all_subdir_linuxkpi_wlan ---
*** [linux_80211.o] Error code 1

make[4]: stopped in /usr/src/sys/modules/linuxkpi_wlan
.ERROR_TARGET='linux_80211.o'
.ERROR_META_FILE='/usr/obj/usr/src/amd64.amd64/sys/TEST18/modules/usr/src/sys/modules/linuxkpi_wlan/linux_80211.o.meta'
.MAKE.LEVEL='4'
MAKEFILE=''
.MAKE.MODE='meta missing-filemon=yes missing-meta=yes silent=yes
verbose' 147.14 real       326.16 user        10.34 sys

make[1]: stopped in /usr/src

make: stopped in /usr/src

  === End quot ===


> The branch main has been updated by bz:
> 
> URL:
https://cgit.FreeBSD.org/src/commit/?id=d0d2911035192473e8bd3f6b99ed5ca9b1b29e47
> 
> commit d0d2911035192473e8bd3f6b99ed5ca9b1b29e47
> Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
> AuthorDate: 2022-06-10 14:18:57 +0000
> Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
> CommitDate: 2022-06-10 14:18:57 +0000
> 
>     LinuxKPI: 802.11: rework handling of the special IEEE80211_NUM_TIDS
queue 
>     
>     Rework the way we are dealing with the last queue.  If the driver
>     opts in to STA_MMPDU_TXQ then preferably send all non-data frames
>     via the last (IEEE80211_NUM_TIDS) queue which otherwise is not used
>     in station mode.
>     If we do not have that queue we do individual tx() calls for
non-data
>     frames now.
>     Everything else goes via the selected queue if possible for as long
as
>     we have a ni (sta) and otherwise resorts to direct tx.
>     
>     Tested on:      Intel AX200 and AX210
>     Sponsored by:   The FreeBSD Foundation
>     MFC after:      3 days
> ---
>  sys/compat/linuxkpi/common/src/linux_80211.c | 54 +++++++++++++++++
+----------
>  1 file changed, 36 insertions(+), 18 deletions(-)

     (snip)

-- 
Tomoaki AOKI    <junchoon@dec.sakura.ne.jp>