From 02f03984b2d648caba8b635327f0024bcc5ef990 Mon Sep 17 00:00:00 2001
From: Jianhui Zhao <jianhui.zhao@gl-inet.com>
Date: Thu, 12 May 2022 16:11:37 +0800
Subject: [PATCH] wlan-ap: wifiax: fix gen macaddr

Signed-off-by: Jianhui Zhao <jianhui.zhao@gl-inet.com>
---
 .../0002-wifiax-fix-gen-macaddr.patch         | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 patches-wlan-ap/0002-wifiax-fix-gen-macaddr.patch

diff --git a/patches-wlan-ap/0002-wifiax-fix-gen-macaddr.patch b/patches-wlan-ap/0002-wifiax-fix-gen-macaddr.patch
new file mode 100644
index 0000000..d29129d
--- /dev/null
+++ b/patches-wlan-ap/0002-wifiax-fix-gen-macaddr.patch
@@ -0,0 +1,48 @@
+From d31f3fe4cc7f78fcef3b441143290b03991d25d6 Mon Sep 17 00:00:00 2001
+From: Jianhui Zhao <jianhui.zhao@gl-inet.com>
+Date: Thu, 12 May 2022 16:10:25 +0800
+Subject: [PATCH] wifiax: fix gen macaddr
+
+Signed-off-by: Jianhui Zhao <jianhui.zhao@gl-inet.com>
+---
+ .../mac80211/files/lib/netifd/wireless/mac80211.sh       | 9 ++++-----
+ feeds/wifi-ax/mac80211/files/lib/wifi/mac80211.sh        | 1 -
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh b/feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh
+index 97c56703..e6b17f6e 100644
+--- a/feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh
++++ b/feeds/wifi-ax/mac80211/files/lib/netifd/wireless/mac80211.sh
+@@ -540,13 +540,12 @@ mac80211_generate_mac() {
+ 
+ 	local oIFS="$IFS"; IFS=":"; set -- $ref; IFS="$oIFS"
+ 	[ "$multiple_bssid" -eq 1 ] && {
+-               printf "02:%s:%s:%s:%s:%02x" $b1 $2 $3 $4 $5 $macidx
+-               return
+-    }
+-	macidx=$(($id + 1))
++		printf "02:%s:%s:%s:%s:%02x" $b1 $2 $3 $4 $5 $macidx
++		return
++	}
+ 
+ 	local use_global=0
+-	[ "$id" -gt 0 -a "$macidx" -le "$num_global_macaddr" ] && use_global=1
++	[ "$id" -gt 0 -a "$id" -lt "$num_global_macaddr" ] && use_global=1
+ 
+ 	[ "$((0x$mask1))" -gt 0 -a "$use_global" -lt 1 ] && {
+ 		b1="0x$1"
+diff --git a/feeds/wifi-ax/mac80211/files/lib/wifi/mac80211.sh b/feeds/wifi-ax/mac80211/files/lib/wifi/mac80211.sh
+index 9b1f05a3..115e5b79 100644
+--- a/feeds/wifi-ax/mac80211/files/lib/wifi/mac80211.sh
++++ b/feeds/wifi-ax/mac80211/files/lib/wifi/mac80211.sh
+@@ -178,7 +178,6 @@ detect_mac80211() {
+ 			set wireless.radio${devidx}.channel=${channel}
+ 			set wireless.radio${devidx}.band=${mode_band}
+ 			set wireless.radio${devidx}.htmode=$htmode
+-			set wireless.radio${devidx}.num_global_macaddr=8
+ 			${scanning}
+ 			set wireless.radio${devidx}.disabled=1
+ 
+-- 
+2.25.1
+