Re: conflicting changes between wireless and wireless-next

On 7/21/2026 1:24 PM, Jeff Johnson wrote:
> Johannes,
> I'm trying to construct a new ath/main which involves combining:
> wireless + wireless-next + ath-current + ath-next
> 
> I'm seeing a conflict when combining wireless and wireless-next.
> 
> There are similar patches in each tree fixing the same problem in a slightly
> different way.
> 
> Can you pick one over the other? I'm guessing drop the wireless-next version?
> 
> thanks
> /jeff
> 
> wireless:
> commit 4a360c6e18dfa9d70006c7247a6a8cc8dfe0d60f
> Author: Zhao Li <[email protected]>
> Date:   Sat Jun 13 02:50:45 2026 +0800
> 
>     wifi: mac80211: validate deauth frame length before reason access
> 
> @@ -5641,13 +5641,15 @@ static void ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
>                                      struct ieee80211_mgmt *mgmt, size_t len)
>  {
>         struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
> -       u16 reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
> +       u16 reason_code;
>  
>         lockdep_assert_wiphy(sdata->local->hw.wiphy);
>  
> -       if (len < 24 + 2)
> +       if (len < offsetofend(struct ieee80211_mgmt, u.deauth.reason_code))
>                 return;
>  
> +       reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
> +
> 
> wireless-next
> commit 8a0ed6ce39852d6a5dace3b3908c77c17468f250
> Author: Shahar Tzarfati <[email protected]>
> Date:   Wed Jul 15 21:27:44 2026 +0300
> 
>     wifi: mac80211: mlme: read deauth reason_code after frame length check
> 
> @@ -5639,13 +5639,15 @@ static void ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
>                                      struct ieee80211_mgmt *mgmt, size_t len)
>  {
>         struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
> -       u16 reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
> +       u16 reason_code;
>  
>         lockdep_assert_wiphy(sdata->local->hw.wiphy);
>  
> -       if (len < 24 + 2)
> +       if (len < IEEE80211_DEAUTH_FRAME_LEN)
>                 return;
>  
> +       reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
> +
> 
> 

There is a second conflict, but unrelated changes
(take both sets)

wireless:
commit 035ed430ce6a2c35b01e211844a9f0a7643e57a4
Author: Zhao Li <[email protected]>
Date:   Fri Jun 12 23:24:41 2026 +0800

    wifi: mac80211: avoid non-S1G AID fallback for S1G assoc

--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -7138,7 +7138,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
 {
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
        struct ieee80211_mgd_assoc_data *assoc_data = ifmgd->assoc_data;
-       u16 capab_info, status_code, aid;
+       u16 capab_info, status_code, aid = 0;
        struct ieee80211_elems_parse_params parse_params = {
                .bss = NULL,
                .link_id = -1,

wireless-next
commit a607344292c2ec4546f33ed360eb713d261a7133
Author: Pagadala Yesu Anjaneyulu <[email protected]>
Date:   Fri Jul 17 17:10:44 2026 +0300

    wifi: mac80211: notify driver before destroying assoc link

@@ -7138,6 +7146,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_
sub_if_data *sdata,
 {
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
        struct ieee80211_mgd_assoc_data *assoc_data = ifmgd->assoc_data;
+       enum assoc_status assoc_status = ASSOC_ABANDON;
        u16 capab_info, status_code, aid;
        struct ieee80211_elems_parse_params parse_params = {
                .bss = NULL,