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

[Mark Brown]

Hi all,

After merging the net-next tree, today's linux-next build (arm64
defconfig) failed like this:

/tmp/next/build/net/wireless/nl80211.c: In function 'nl80211_calculate_ap_capabilities':
/tmp/next/build/net/wireless/nl80211.c:6999:41: error: 'struct cfg80211_ap_settings' has no member named 'he_oper'
 6999 |         if (!!params->he_cap != !!params->he_oper)
      |                                         ^~
/tmp/next/build/net/wireless/nl80211.c:7002:42: error: 'struct cfg80211_ap_settings' has no member named 'eht_oper'
 7002 |         if (!!params->eht_cap != !!params->eht_oper)
      |                                          ^~

Caused by commit

   cb9959ab5f996 (wifi: cfg80211: enforce HE/EHT cap/oper consistency)

interacting with changes in the net-next tree.  I have applied the fixup
below:

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index c0f8d0bf1bea2..d947a9f6045a9 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -6996,10 +6996,10 @@ static int nl80211_calculate_ap_capabilities(struct genl_info *info,
 		}
 	}
 
-	if (!!params->he_cap != !!params->he_oper)
+	if (!!params->he_cap != !!params->beacon.he_oper)
 		return -EINVAL;
 
-	if (!!params->eht_cap != !!params->eht_oper)
+	if (!!params->eht_cap != !!params->beacon.eht_oper)
 		return -EINVAL;
 
 	return 0;

Attachment: signature.asc
Description: PGP signature