Skip to content

W
White Rabbit Switch - Software
Commit c892aaf6 authored by Jean-Claude BAU's avatar Jean-Claude BAU
Browse files
Options

VLAN config 

- New script to generate the VLAN kconfig
- Allows raw configuration for vlan ports
- New key for PTP VID
parent fd042d17
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 67319 additions and 4549 deletions
Kconfig_vlans.in
View file @ c892aaf6
This diff is collapsed.
gen_kconfig_vlans.sh 0 → 100755
View file @ c892aaf6
This diff is collapsed.
userspace/rootfs_override/wr/bin/assembly_ppsi_conf.sh
View file @ c892aaf6
......@@ -542,11 +542,12 @@ for i_port in {01..18}; do # scan all the physical ports
# add vlans
if [ "$CONFIG_VLANS_ENABLE" = "y" ]; then
unset ppsi_vlans;
unset port_vid;
unset port_mode_access;
unset port_mode_trunk;
unset port_mode_unqualified;
unset port_mode_disabled;
unset port_ptp_vid
# check port mode
port_mode_access=$(eval "echo \$CONFIG_VLANS_PORT"$i_port"_MODE_ACCESS")
......@@ -554,16 +555,22 @@ for i_port in {01..18}; do # scan all the physical ports
port_mode_unqualified=$(eval "echo \$CONFIG_VLANS_PORT"$i_port"_MODE_UNQUALIFIED")
port_mode_disabled=$(eval "echo \$CONFIG_VLANS_PORT"$i_port"_MODE_DISABLED")
port_vid=$(eval "echo \$CONFIG_VLANS_PORT"$i_port"_VID")
port_ptp_vid=$(eval "echo \$CONFIG_VLANS_PORT"$i_port"_PTP_VID")
if [ -z "$port_ptp_vid" ] ; then
port_ptp_vid=$port_vid
fi
# check port mode
if [ "$port_mode_access" = "y" ]; then
ppsi_vlans=$(eval "echo \$CONFIG_VLANS_PORT"$i_port"_VID")
# use "&> /dev/null" to avoid error when $ppsi_vlans
# is not a number
if [ "$ppsi_vlans" -ge 0 ] &> /dev/null \
&& [ "$ppsi_vlans" -le 4094 ] &> /dev/null; then
v="$inst_vn[vlan]"; eval ${v}="$ppsi_vlans"
if [ "$port_ptp_vid" -ge 0 ] &> /dev/null \
&& [ "$port_ptp_vid" -le 4094 ] &> /dev/null; then
v="$inst_vn[vlan]"; eval ${v}="$port_ptp_vid"
else
echo "$script_name: Wrong value \"$ppsi_vlans\" in CONFIG_VLANS_PORT"$i_port"_VID" | tee $log_output
echo "$script_name: Wrong value \"$port_ptp_vid\" in CONFIG_VLANS_PORT"$i_port"_VID" | tee $log_output
continue;
fi
fi
......@@ -571,9 +578,8 @@ for i_port in {01..18}; do # scan all the physical ports
if [ "$port_mode_trunk" = "y" ] \
|| [ "$port_mode_disabled" = "y" ] \
|| [ "$port_mode_unqualified" = "y" ]; then
ppsi_vlans=$(eval "echo \$CONFIG_VLANS_PORT"$i_port"_VID")
if [ -n "$ppsi_vlans" ]; then
mod_vlans=${ppsi_vlans//;/,}
if [ -n "$port_ptp_vid" ]; then
mod_vlans=${port_ptp_vid//;/,}
v="$inst_vn[vlan]"; eval ${v}="$mod_vlans"
fi
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment