mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-09 22:42:57 +00:00
421754191d
On Asus RT-N12 and RT-N16 models, the WAN and LAN4 ports are swapped in the
initial switch configuration since the presets present in nvram appear to be
wrong.
Add special casing for these models to detect_by_model() in order to ensure
a proper switch configuration.
Fixes FS#502.
(cherry picked from commit 96ed69101da254b0cb61a0dfc42bd48d27bfacb9
and squashed with commit f2fdd68664)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
192 lines
4.9 KiB
Bash
Executable File
192 lines
4.9 KiB
Bash
Executable File
#!/bin/sh /etc/rc.common
|
|
# Copyright (C) 2006-2015 OpenWrt.org
|
|
|
|
. /lib/functions/system.sh
|
|
. /lib/functions/uci-defaults.sh
|
|
|
|
detect_by_vlanports() {
|
|
local vlan0ports="$(nvram get vlan0ports)"
|
|
local vlan1ports="$(nvram get vlan1ports)"
|
|
local vlan2ports="$(nvram get vlan2ports)"
|
|
local cpuport="$(swconfig dev switch0 help 2>/dev/null | sed -ne "s|.*cpu @ \([0-9]*\).*|\1|p")"
|
|
|
|
if [ "${vlan0ports:0:9}" = "0 1 2 3 8" -a "${vlan1ports:0:3}" = "4 8" -a ${cpuport:-0} -eq 8 ] || \
|
|
[ "${vlan1ports:0:9}" = "0 1 2 3 8" -a "${vlan2ports:0:3}" = "4 8" -a ${cpuport:-0} -eq 8 ] || \
|
|
[ "${vlan2ports:0:9}" = "0 1 2 3 8" -a "${vlan1ports:0:3}" = "4 8" -a ${cpuport:-0} -eq 8 ];
|
|
then
|
|
ucidef_add_switch "switch0" \
|
|
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "8@eth0"
|
|
|
|
elif [ "${vlan0ports:0:9}" = "1 2 3 4 8" -a "${vlan1ports:0:3}" = "0 8" -a ${cpuport:-0} -eq 8 ] || \
|
|
[ "${vlan1ports:0:9}" = "1 2 3 4 8" -a "${vlan2ports:0:3}" = "0 8" -a ${cpuport:-0} -eq 8 ] || \
|
|
[ "${vlan2ports:0:9}" = "1 2 3 4 8" -a "${vlan1ports:0:3}" = "0 8" -a ${cpuport:-0} -eq 8 ];
|
|
then
|
|
ucidef_add_switch "switch0" \
|
|
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "8@eth0"
|
|
|
|
elif [ "${vlan0ports:0:9}" = "0 1 2 3 5" -a "${vlan1ports:0:3}" = "4 5" -a ${cpuport:-0} -eq 5 ] || \
|
|
[ "${vlan1ports:0:9}" = "0 1 2 3 5" -a "${vlan2ports:0:3}" = "4 5" -a ${cpuport:-0} -eq 5 ] || \
|
|
[ "${vlan2ports:0:9}" = "0 1 2 3 5" -a "${vlan1ports:0:3}" = "4 5" -a ${cpuport:-0} -eq 5 ];
|
|
then
|
|
ucidef_add_switch "switch0" \
|
|
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0"
|
|
|
|
elif [ "${vlan0ports:0:9}" = "1 2 3 4 5" -a "${vlan1ports:0:3}" = "0 5" -a ${cpuport:-0} -eq 5 ] || \
|
|
[ "${vlan1ports:0:9}" = "1 2 3 4 5" -a "${vlan2ports:0:3}" = "0 5" -a ${cpuport:-0} -eq 5 ] || \
|
|
[ "${vlan2ports:0:9}" = "1 2 3 4 5" -a "${vlan1ports:0:3}" = "0 5" -a ${cpuport:-0} -eq 5 ];
|
|
then
|
|
ucidef_add_switch "switch0" \
|
|
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5@eth0"
|
|
|
|
else
|
|
logger -t "01_detect" "Unable to determine network configuration"
|
|
ucidef_set_interface_lan "eth0"
|
|
fi
|
|
}
|
|
|
|
detect_by_boardnum() {
|
|
local boardnum="$1"
|
|
|
|
case "$boardnum" in
|
|
# WAP54G, Sitecom WL-105b
|
|
"2" | \
|
|
"1024")
|
|
ucidef_set_interface_lan "eth0"
|
|
;;
|
|
|
|
# Generic detection fallback
|
|
*)
|
|
detect_by_vlanports
|
|
;;
|
|
esac
|
|
}
|
|
|
|
detect_by_boardtype() {
|
|
local boardtype="$1"
|
|
local boardnum="$2"
|
|
|
|
case "$boardtype" in
|
|
"bcm94710r4")
|
|
ucidef_set_interfaces_lan_wan "eth0" "eth1"
|
|
;;
|
|
|
|
"0x0467")
|
|
ucidef_add_switch "switch0" \
|
|
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0"
|
|
;;
|
|
|
|
"0x042f" | \
|
|
"0x0472")
|
|
# WL-500gP
|
|
if [ "$boardnum" = "45" ]; then
|
|
ucidef_add_switch "switch0" \
|
|
"0:wan" "1:lan" "2:lan" "3:lan" "4:lan" "5@eth0"
|
|
|
|
# Generic BCM94704
|
|
else
|
|
ucidef_set_interface_wan "eth1"
|
|
ucidef_add_switch "switch0" \
|
|
"0:lan" "1:lan" "2:lan" "3:lan" "4:lan" "5@eth0"
|
|
|
|
# MAC addresses on 4704 tend to be screwed up. Add a workaround here
|
|
local mac="$(nvram get et0macaddr)"
|
|
local pat="[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]"
|
|
pat="$pat:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]"
|
|
pat="$pat:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]"
|
|
|
|
case "$mac" in
|
|
$pat)
|
|
ucidef_set_interface_macaddr "lan" "$mac"
|
|
ucidef_set_interface_macaddr "wan" "$(macaddr_add "$mac" 1)"
|
|
;;
|
|
esac
|
|
fi
|
|
;;
|
|
|
|
# Buffalo WBR-B11 and Buffalo WBR-G54
|
|
"bcm94710ap")
|
|
ucidef_set_interface_wan "eth1"
|
|
ucidef_add_switch "switch0" \
|
|
"0:lan" "1:lan" "2:lan" "3:lan" "4:lan" "5@eth0"
|
|
;;
|
|
|
|
*)
|
|
detect_by_boardnum "$boardnum"
|
|
;;
|
|
esac
|
|
}
|
|
|
|
detect_by_model() {
|
|
local model="$1"
|
|
local boardtype="$2"
|
|
local boardnum="$3"
|
|
|
|
# Netgear WGT634U exception
|
|
if grep -sqE 'mtd0: 000(6|a)0000' /proc/mtd; then
|
|
ucidef_add_switch "switch0" \
|
|
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0"
|
|
return
|
|
fi
|
|
|
|
case "$model" in
|
|
"Asus WLHDD" | \
|
|
"Asus WL300G")
|
|
ucidef_set_interface_lan "eth1"
|
|
;;
|
|
|
|
"Asus WL330GE")
|
|
ucidef_add_switch "switch0" "4:lan" "5t@eth0"
|
|
;;
|
|
|
|
"Asus WL500G" | \
|
|
"Asus WL500W" | \
|
|
"Microsoft MN-700")
|
|
ucidef_set_interfaces_lan_wan "eth0" "eth1"
|
|
;;
|
|
|
|
"Asus RT-N12"* | \
|
|
"Asus WL500GP V2" | \
|
|
"Buffalo WHR-G125" | \
|
|
"Motorola WR850G" | \
|
|
"Siemens SE505 V2")
|
|
ucidef_add_switch "switch0" \
|
|
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0"
|
|
;;
|
|
|
|
"Asus WL700")
|
|
ucidef_add_switch "switch0" \
|
|
"0:wan" "1:lan" "2:lan" "3:lan" "4:lan" "5@eth0"
|
|
;;
|
|
|
|
"Dell TrueMobile 2300")
|
|
ucidef_set_interface_wan "eth1"
|
|
ucidef_add_switch "switch0" \
|
|
"0:lan" "1:lan" "2:lan" "3:lan" "5@eth0"
|
|
;;
|
|
|
|
"Asus RT-N16"* | \
|
|
"Linksys E3000 V1")
|
|
ucidef_add_switch "switch0" \
|
|
"0:wan" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "8@eth0"
|
|
;;
|
|
|
|
*)
|
|
detect_by_boardtype "$boardtype" "$boardnum"
|
|
;;
|
|
esac
|
|
}
|
|
|
|
|
|
model="$(sed -ne 's/^machine[ \t]*: //p' /proc/cpuinfo)"
|
|
boardtype="$(nvram get boardtype)"
|
|
boardnum="$(nvram get boardnum)"
|
|
|
|
board_config_update
|
|
|
|
ucidef_set_board_id "$boardtype${boardnum:+:$boardnum}"
|
|
ucidef_set_model_name "$model"
|
|
|
|
detect_by_model "$model" "$boardtype" "$boardnum"
|
|
|
|
board_config_flush
|