linux-next: build failure after merge of the wireless-next tree

linux-next: build failure after merge of the wireless-next tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1070 bytes --]

Hi all,

After merging the wireless-next tree, today's linux-next build
(arm64_defconfig.log /tmp/next/x86_64 allmodconfig) failed like this:

/tmp/next/build/net/mac80211/mlme.c:
In function 'ieee80211_rx_mgmt_assoc_resp':
/tmp/next/build/net/mac80211/mlme.c:7279:17: error: label 'abandon_assoc'
used but not defined
 7279 |                 goto abandon_assoc;
      |                 ^~~~

Caused by a semantic conflict (probably the same two patches as the
merge I posted a minute ago).  I have applied the patch below and can
carry as needed:

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 60fc407bb1ebb..5a1c022282202 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -7276,7 +7276,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
 	else if (!assoc_data->s1g)
 		aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
 	else if (status_code == WLAN_STATUS_SUCCESS)
-		goto abandon_assoc;
+		goto notify_driver;
 
 	/*
 	 * The 5 MSB of the AID field are reserved for a non-S1G STA. For

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the wireless-next tree

[Johannes Berg]

Hi,

Thanks for the heads-up!

> /tmp/next/build/net/mac80211/mlme.c:
> In function 'ieee80211_rx_mgmt_assoc_resp':
> /tmp/next/build/net/mac80211/mlme.c:7279:17: error: label 'abandon_assoc'
> used but not defined
>  7279 |                 goto abandon_assoc;
>       |                 ^~~~
> 
> Caused by a semantic conflict (probably the same two patches as the
> merge I posted a minute ago).

Yeah. I was _just_ going to reply to that email asking if it actually
built! :-)

> I have applied the patch below and can
> carry as needed:
> 
> diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
> index 60fc407bb1ebb..5a1c022282202 100644
> --- a/net/mac80211/mlme.c
> +++ b/net/mac80211/mlme.c
> @@ -7276,7 +7276,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
>  	else if (!assoc_data->s1g)
>  		aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
>  	else if (status_code == WLAN_STATUS_SUCCESS)
> -		goto abandon_assoc;
> +		goto notify_driver;

I think it needs to be "goto destroy_assoc_data" instead for
correctness, but that's just based on what Jeff told me last night.

Sorry for the mess! I didn't realize this was going to happen :(

Anyway, the plan is for me to do a (hopefully correct) merge after
wireless will is merged into net etc., test it, and then provide that
with the pull request of wireless-next into net-next. I think it'll take
a few days though, more likely early next week than late this week.

johannes

linux-next: build failure after merge of the wireless-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1179 bytes --]

Hi all,

After merging the wireless-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/net/wireless/realtek/rtw88/led.c:19:6: error: redefinition of 'rtw_led_init'
   19 | void rtw_led_init(struct rtw_dev *rtwdev)
      |      ^~~~~~~~~~~~
In file included from drivers/net/wireless/realtek/rtw88/led.c:7:
drivers/net/wireless/realtek/rtw88/led.h:15:20: note: previous definition of 'rtw_led_init' with type 'void(struct rtw_dev *)'
   15 | static inline void rtw_led_init(struct rtw_dev *rtwdev)
      |                    ^~~~~~~~~~~~
drivers/net/wireless/realtek/rtw88/led.c:64:6: error: redefinition of 'rtw_led_deinit'
   64 | void rtw_led_deinit(struct rtw_dev *rtwdev)
      |      ^~~~~~~~~~~~~~
drivers/net/wireless/realtek/rtw88/led.h:19:20: note: previous definition of 'rtw_led_deinit' with type 'void(struct rtw_dev *)'
   19 | static inline void rtw_led_deinit(struct rtw_dev *rtwdev)
      |                    ^~~~~~~~~~~~~~

Caused by commit

  4b6652bc6d8d ("wifi: rtw88: Add support for LED blinking")

I have used the wireless-next tree from next-20250115 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

RE: linux-next: build failure after merge of the wireless-next tree

[Ping-Ke Shih]

Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
> 
> After merging the wireless-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/net/wireless/realtek/rtw88/led.c:19:6: error: redefinition of 'rtw_led_init'
>    19 | void rtw_led_init(struct rtw_dev *rtwdev)
>       |      ^~~~~~~~~~~~
> In file included from drivers/net/wireless/realtek/rtw88/led.c:7:
> drivers/net/wireless/realtek/rtw88/led.h:15:20: note: previous definition of 'rtw_led_init' with type
> 'void(struct rtw_dev *)'
>    15 | static inline void rtw_led_init(struct rtw_dev *rtwdev)
>       |                    ^~~~~~~~~~~~
> drivers/net/wireless/realtek/rtw88/led.c:64:6: error: redefinition of 'rtw_led_deinit'
>    64 | void rtw_led_deinit(struct rtw_dev *rtwdev)
>       |      ^~~~~~~~~~~~~~
> drivers/net/wireless/realtek/rtw88/led.h:19:20: note: previous definition of 'rtw_led_deinit' with type
> 'void(struct rtw_dev *)'
>    19 | static inline void rtw_led_deinit(struct rtw_dev *rtwdev)
>       |                    ^~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   4b6652bc6d8d ("wifi: rtw88: Add support for LED blinking")
> 
> I have used the wireless-next tree from next-20250115 for today.

I reproduced this issue, and fixed it by a patch [1].

[1] https://lore.kernel.org/linux-wireless/20250116054337.35723-1-pkshih@realtek.com/T/#u

Re: linux-next: build failure after merge of the wireless-next tree

[Kalle Valo]

Ping-Ke Shih <pkshih@realtek.com> writes:

> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>> Hi all,
>> 
>> After merging the wireless-next tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>> 
>> drivers/net/wireless/realtek/rtw88/led.c:19:6: error: redefinition of 'rtw_led_init'
>>    19 | void rtw_led_init(struct rtw_dev *rtwdev)
>>       |      ^~~~~~~~~~~~
>> In file included from drivers/net/wireless/realtek/rtw88/led.c:7:
>> drivers/net/wireless/realtek/rtw88/led.h:15:20: note: previous definition of 'rtw_led_init' with type
>> 'void(struct rtw_dev *)'
>>    15 | static inline void rtw_led_init(struct rtw_dev *rtwdev)
>>       |                    ^~~~~~~~~~~~
>> drivers/net/wireless/realtek/rtw88/led.c:64:6: error: redefinition of 'rtw_led_deinit'
>>    64 | void rtw_led_deinit(struct rtw_dev *rtwdev)
>>       |      ^~~~~~~~~~~~~~
>> drivers/net/wireless/realtek/rtw88/led.h:19:20: note: previous definition of 'rtw_led_deinit' with type
>> 'void(struct rtw_dev *)'
>>    19 | static inline void rtw_led_deinit(struct rtw_dev *rtwdev)
>>       |                    ^~~~~~~~~~~~~~
>> 
>> Caused by commit
>> 
>>   4b6652bc6d8d ("wifi: rtw88: Add support for LED blinking")
>> 
>> I have used the wireless-next tree from next-20250115 for today.
>
> I reproduced this issue, and fixed it by a patch [1].
>
> [1] https://lore.kernel.org/linux-wireless/20250116054337.35723-1-pkshih@realtek.com/T/#u

The v2 of that patch is now applied:

https://git.kernel.org/wireless/wireless-next/c/b4bfbc50b1b9

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

linux-next: build failure after merge of the wireless-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

Hi all,

After merging the wireless-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: modpost: "wireless_nlevent_flush" [net/wireless/cfg80211.ko] undefined!

Caused by commit

  aee809aaa2d1 ("wifi: cfg80211: unexport wireless_nlevent_flush()")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the wireless-next tree

[Johannes Berg]

On Wed, 2024-10-09 at 12:04 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the wireless-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: modpost: "wireless_nlevent_flush" [net/wireless/cfg80211.ko] undefined!
> 
> Caused by commit
> 
>   aee809aaa2d1 ("wifi: cfg80211: unexport wireless_nlevent_flush()")
> 
> I have reverted that commit for today.

Oops. I totally forgot that wext-core is always built-in (while cfg80211
can be a module ...). I've reverted it as well.

johannes

Re: linux-next: build failure after merge of the wireless-next tree

[Luis R. Rodriguez]

On Mon, Dec 19, 2011 at 6:57 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Luis,
>
> On Mon, 19 Dec 2011 18:42:02 -0800 "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com> wrote:
>>
>> On Mon, Dec 19, 2011 at 6:18 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> > Hi John,
>> >
>> > After merging the wireless-next tree, today's linux-next build (x86_64
>> > allmodconfig) failed like this:
>> >
>> > drivers/net/wireless/ath/ath9k/dfs.c: In function 'ath9k_postprocess_radar_event':
>> > drivers/net/wireless/ath/ath9k/dfs.c:73:1: error: 'ATH_DBG_ATH_DBG_DFS' undeclared (first use in this function)
>> > drivers/net/wireless/ath/ath9k/dfs.c: In function 'ath9k_dfs_process_phyerr':
>> > drivers/net/wireless/ath/ath9k/dfs.c:166:1: error: 'ATH_DBG_ATH_DBG_DFS' undeclared (first use in this function)
>> >
>> > Caused by commit 29942bc12537 ("ath9k: add DFS radar pulse processing").
>> > ath_dbg prepends ATH_DBG_ to its second argument.
>> >
>> > I have used the wireless-next tree from next-20111219 for today.
>>
>> Odd, gitweb for wireless-next.git shows only one commit to dfs.c, the
>> change that introduced it:
>>
>> http://git.kernel.org/?p=linux/kernel/git/linville/wireless-next.git;a=history;f=drivers/net/wireless/ath/ath9k/dfs.c;h=e4e84a9e62730f3780a7eda6b4b00d535dd1d428;hb=HEAD
>>
>> In that version of the file I see nothing with ATH_DBG_ATH_DBG_DFS. I
>> also do not see it on wireless-testing.
>>
>> mcgrof@tux ~/wireless-testing (git::master)$ git show 29942bc12537 |
>> grep ATH_DBG_ATH_DBG_DFS
>
> Yeah, see my comment above .. search for ATH_DBG_DFS.

Ah fuck, Joe's patch got in *later* and it did not address changing
dfs.c. I had raised this as a comment to Joe's patch while we had
pending patches. It seems this is collateral damage or roadkill.

commit d2182b69dcb6a68b1ef6070b2efd094e13dea3f1
Author: Joe Perches <joe@perches.com>
Date:   Thu Dec 15 14:55:53 2011 -0800

    ath: Convert ath_dbg(bar, ATH_DBG_<FOO>, to ath_dbg(bar, FOO

    Add ATH_DBG_ to macros to shorten the uses and
    reduce the line count.

    Coalesce ath_dbg formats.
    Add missing spaces to coalesced formats.
    Add missing newline terminations to ath_dbg formats.
    Align ath_dbg arguments where appropriate.
    Standardize ath_dbg formats without periods.

    Signed-off-by: Joe Perches <joe@perches.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

Sorry for the trouble but the fix is trivial, I'll sumbit shortly.

  Luis