ipq807x: explicitly set the lable_mac_addr on WF194c

Some older units did not have a stable serial number when connecting
to the GW. Fix this by explicitly setting the label_mac, this allows
the uci-defaults script to correctly pick up the right MAC.

Fixes: WIFI-5834
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2021-11-30 07:52:24 +01:00
parent 87be030169
commit 5fc7ac166a

View File

@@ -1,7 +1,7 @@
From 85462b8b429bbd0bd5b56ac58ea861b9eef32a2e Mon Sep 17 00:00:00 2001 From d977d1240924a1ab3d283cd7bd91bcb3004e7949 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org> From: John Crispin <john@phrozen.org>
Date: Sat, 18 Jul 2020 08:53:44 +0200 Date: Sat, 18 Jul 2020 08:53:44 +0200
Subject: [PATCH 01/34] ipq807x: add the Qualcomm AX target support Subject: [PATCH 01/36] ipq807x: add the Qualcomm AX target support
Signed-off-by: John Crispin <john@phrozen.org> Signed-off-by: John Crispin <john@phrozen.org>
--- ---
@@ -13,7 +13,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
target/linux/ipq807x/109-logspam.patch | 24 + target/linux/ipq807x/109-logspam.patch | 24 +
target/linux/ipq807x/Makefile | 22 + target/linux/ipq807x/Makefile | 22 +
.../ipq807x/base-files/etc/board.d/01_leds | 38 + .../ipq807x/base-files/etc/board.d/01_leds | 38 +
.../ipq807x/base-files/etc/board.d/02_network | 80 + .../ipq807x/base-files/etc/board.d/02_network | 81 +
.../etc/hotplug.d/firmware/10-ath11k-caldata | 95 + .../etc/hotplug.d/firmware/10-ath11k-caldata | 95 +
.../ipq807x/base-files/etc/hotplug.d/net/macs | 3 + .../ipq807x/base-files/etc/hotplug.d/net/macs | 3 +
.../ipq807x/base-files/etc/init.d/aq_phy | 16 + .../ipq807x/base-files/etc/init.d/aq_phy | 16 +
@@ -66,7 +66,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
target/linux/ipq807x/patches/112-pstore.patch | 147 + target/linux/ipq807x/patches/112-pstore.patch | 147 +
.../ipq807x/patches/200-bpf_backport.patch | 44780 ++++++++++++++++ .../ipq807x/patches/200-bpf_backport.patch | 44780 ++++++++++++++++
toolchain/kernel-headers/Makefile | 8 + toolchain/kernel-headers/Makefile | 8 +
61 files changed, 56685 insertions(+), 2 deletions(-) 61 files changed, 56686 insertions(+), 2 deletions(-)
create mode 100644 package/boot/uboot-envtools/files/ipq807x create mode 100644 package/boot/uboot-envtools/files/ipq807x
create mode 100644 target/linux/ipq807x/109-logspam.patch create mode 100644 target/linux/ipq807x/109-logspam.patch
create mode 100644 target/linux/ipq807x/Makefile create mode 100644 target/linux/ipq807x/Makefile
@@ -344,10 +344,10 @@ index 0000000000..1f1797b0c6
+exit 0 +exit 0
diff --git a/target/linux/ipq807x/base-files/etc/board.d/02_network b/target/linux/ipq807x/base-files/etc/board.d/02_network diff --git a/target/linux/ipq807x/base-files/etc/board.d/02_network b/target/linux/ipq807x/base-files/etc/board.d/02_network
new file mode 100755 new file mode 100755
index 0000000000..9d7dd4e61e index 0000000000..7772e309a3
--- /dev/null --- /dev/null
+++ b/target/linux/ipq807x/base-files/etc/board.d/02_network +++ b/target/linux/ipq807x/base-files/etc/board.d/02_network
@@ -0,0 +1,80 @@ @@ -0,0 +1,81 @@
+#!/bin/sh +#!/bin/sh
+ +
+. /lib/functions.sh +. /lib/functions.sh
@@ -410,6 +410,7 @@ index 0000000000..9d7dd4e61e
+ lan_mac=$(macaddr_add "$wan_mac" 1) + lan_mac=$(macaddr_add "$wan_mac" 1)
+ ucidef_set_network_device_mac eth0 $lan_mac + ucidef_set_network_device_mac eth0 $lan_mac
+ ucidef_set_network_device_mac eth1 $wan_mac + ucidef_set_network_device_mac eth1 $wan_mac
+ ucidef_set_label_macaddr $wan_mac
+ ;; + ;;
+ *) + *)
+ wan_mac=$(cat /sys/class/net/eth0/address) + wan_mac=$(cat /sys/class/net/eth0/address)
@@ -531,7 +532,7 @@ index 0000000000..1788908ab0
+esac +esac
diff --git a/target/linux/ipq807x/base-files/etc/hotplug.d/net/macs b/target/linux/ipq807x/base-files/etc/hotplug.d/net/macs diff --git a/target/linux/ipq807x/base-files/etc/hotplug.d/net/macs b/target/linux/ipq807x/base-files/etc/hotplug.d/net/macs
new file mode 100644 new file mode 100644
index 0000000000..13e95ec947 index 0000000000..10f38108c8
--- /dev/null --- /dev/null
+++ b/target/linux/ipq807x/base-files/etc/hotplug.d/net/macs +++ b/target/linux/ipq807x/base-files/etc/hotplug.d/net/macs
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@