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

[Mark Brown]

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: signature.asc
Description: PGP signature