him411/gl-infra-builder-FUjr
1
0
Fork 0
mirror of https://github.com/FUjr/gl-infra-builder.git synced 2025-12-17 09:34:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wlan-ap: wifiax: fix gen macaddr

Browse Source 
Signed-off-by: Jianhui Zhao <jianhui.zhao@gl-inet.com>
This commit is contained in:
Jianhui Zhao 2022-05-12 16:11:37 +08:00
parent e9b425ad7f
commit 02f03984b2
1 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
patches-wlan-ap/0002-wifiax-fix-gen-macaddr.patch Normal file
View File

@ -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