@@ -1,3 +1,5 @@
+. /lib/functions/fff/network
+
WANDEV=eth0
SWITCHDEV=eth0
CLIENT_PORTS=""
@@ -9,3 +11,4 @@ ONE_PORT="YES"
ETHMESHMAC=$(cat /sys/class/net/eth0/address)
ROUTERMAC=$(cat /sys/class/net/eth0/address)
+ETH0MAC=$(macFlipLocalBit "$(cat /sys/class/ieee80211/phy0/macaddress)")
@@ -1,3 +1,5 @@
+. /lib/functions/fff/network
+
WANDEV=eth0
SWITCHDEV=eth0
CLIENT_PORTS=""
@@ -8,3 +10,4 @@ ONE_PORT="YES"
. /etc/network.mode
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
+ETH0MAC=$(macFlipLocalBit "$ROUTERMAC")
@@ -1,3 +1,5 @@
+. /lib/functions/fff/network
+
WANDEV=eth0
SWITCHDEV=eth0
CLIENT_PORTS=""
@@ -8,3 +10,4 @@ ONE_PORT="YES"
. /etc/network.mode
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
+ETH0MAC=$(macFlipLocalBit "$ROUTERMAC")
@@ -1,3 +1,5 @@
+. /lib/functions/fff/network
+
WANDEV=eth0
SWITCHDEV=eth0
CLIENT_PORTS=""
@@ -8,3 +10,4 @@ ONE_PORT="YES"
. /etc/network.mode
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
+ETH0MAC=$(macFlipLocalBit "$ROUTERMAC")
@@ -1,3 +1,5 @@
+. /lib/functions/fff/network
+
WANDEV=eth0
SWITCHDEV=eth0
CLIENT_PORTS=""
@@ -8,3 +10,4 @@ ONE_PORT="YES"
. /etc/network.mode
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
+ETH0MAC=$(macFlipLocalBit "$ROUTERMAC")
@@ -1,3 +1,5 @@
+. /lib/functions/fff/network
+
WANDEV=eth0
SWITCHDEV=eth0
CLIENT_PORTS=""
@@ -8,3 +10,4 @@ ONE_PORT="YES"
. /etc/network.mode
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
+ETH0MAC=$(macFlipLocalBit "$ROUTERMAC")
@@ -1,3 +1,5 @@
+. /lib/functions/fff/network
+
WANDEV=eth0
SWITCHDEV=eth0
CLIENT_PORTS=""
@@ -8,3 +10,4 @@ ONE_PORT="YES"
. /etc/network.mode
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
+ETH0MAC=$(macFlipLocalBit "$ROUTERMAC")
@@ -1,3 +1,5 @@
+. /lib/functions/fff/network
+
WANDEV=eth0
SWITCHDEV=eth0
CLIENT_PORTS=""
@@ -8,3 +10,4 @@ ONE_PORT="YES"
. /etc/network.mode
ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
+ETH0MAC=$(macFlipLocalBit "$ROUTERMAC")
@@ -133,6 +133,7 @@ if [ "$ONE_PORT" = "YES" ] && ( ! uci -q get network.$SWITCHDEV.ifname || [ "$FO
uci set network.wan.ifname="$WANDEV"
uci del uci set network.ethmesh.ifname
uci del network.eth0.macaddr
+ ETH0MAC=""
elif [ "$ETHMODE" = "CLIENT" ] ; then
echo "net.ipv6.conf.$WANDEV.accept_ra_defrtr = 0" >> /etc/sysctl.conf
echo "net.ipv6.conf.$WANDEV.accept_ra_pinfo = 0" >> /etc/sysctl.conf
@@ -142,6 +143,7 @@ if [ "$ONE_PORT" = "YES" ] && ( ! uci -q get network.$SWITCHDEV.ifname || [ "$FO
uci set network.wan.ifname="eth1" #eth1 because it is default in config file
uci del network.ethmesh.ifname
uci del network.eth0.macaddr
+ ETH0MAC=""
elif [ "$ETHMODE" = "BATMAN" ] ; then
echo "net.ipv6.conf.$WANDEV.accept_ra_defrtr = 0" >> /etc/sysctl.conf
echo "net.ipv6.conf.$WANDEV.accept_ra_pinfo = 0" >> /etc/sysctl.conf
@@ -150,7 +152,6 @@ if [ "$ONE_PORT" = "YES" ] && ( ! uci -q get network.$SWITCHDEV.ifname || [ "$FO
uci set network.mesh.ifname="bat0"
uci set network.wan.ifname="eth1" #eth1 because it is default in config file
uci set network.ethmesh.ifname="$SWITCHDEV"
- ETH0MAC="w2ap"
fi
uci commit
fi
ETH0MAC is relevant only for ONE_PORT devices. For those, ROUTERMAC is typically evaluated by former w2mesh, now phy0. Thus, we can obtain the w2ap MAC by only shifting the bit of ROUTERMAC. In configurenetwork, instead of setting it for BATMAN mode, we just unset it for the other two modes. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- NOT TESTED. --- src/packages/fff/fff-network/ar71xx/network.tl-mr3020-v1 | 3 +++ src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1 | 3 +++ src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1 | 3 +++ src/packages/fff/fff-network/ar71xx/network.tl-wa901nd-v2 | 3 +++ src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m | 3 +++ src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw | 3 +++ src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m | 3 +++ src/packages/fff/fff-network/ar71xx/network.ubnt-unifi | 3 +++ src/packages/fff/fff-network/files/usr/sbin/configurenetwork | 3 ++- 9 files changed, 26 insertions(+), 1 deletion(-)