3 files changed, 6 insertions, 11 deletions
diff --git a/data/templates/grub/grub_compat.j2 b/data/templates/grub/grub_compat.j2
index d1085eec8..8fb4f71dc 100644
--- a/data/templates/grub/grub_compat.j2
+++ b/data/templates/grub/grub_compat.j2
@@ -14,8 +14,6 @@
     KVM
 {%- elif type == 'ttyS' -%}
     Serial
-{%- elif type == 'ttyUSB' -%}
-    USB
 {%- else -%}
     Unknown
 {%- endif %}
@@ -25,8 +23,6 @@
     console=ttyS0,{{ console_speed }} console=tty0
 {%- elif type == 'ttyS' -%}
     console=tty0 console=ttyS0,{{ console_speed }}
-{%- elif type == 'ttyUSB' -%}
-    console=tty0 console=ttyUSB0,115200
 {%- else -%}
     console=tty0 console=ttyS0,{{ console_speed }}
 {%- endif %}
diff --git a/data/templates/grub/grub_options.j2 b/data/templates/grub/grub_options.j2
index c8a1472e1..a00bf4e37 100644
--- a/data/templates/grub/grub_options.j2
+++ b/data/templates/grub/grub_options.j2
@@ -33,12 +33,6 @@ submenu "Boot options" {
             setup_serial
             configfile ${prefix}/grub.cfg.d/*vyos-menu*.cfg
         }
-        menuentry "ttyUSB (USB serial)" {
-            set console_type="ttyUSB"
-            export console_type
-            setup_serial
-            configfile ${prefix}/grub.cfg.d/*vyos-menu*.cfg
-        }
     }
     menuentry "Enter console number" {
         read console_num
diff --git a/data/templates/wifi/hostapd.conf.j2 b/data/templates/wifi/hostapd.conf.j2
index 83009242b..769325b49 100644
--- a/data/templates/wifi/hostapd.conf.j2
+++ b/data/templates/wifi/hostapd.conf.j2
@@ -28,6 +28,12 @@ interface={{ ifname }}
 {%     for bridge in is_bridge_member %}
 bridge={{ bridge }}
 {%     endfor %}
+
+# WDS (4-address frame) mode with per-station virtual interfaces
+# (only supported with driver=nl80211)
+# This mode allows associated stations to use 4-address frames to allow layer 2
+# bridging to be used.
+wds_sta=1
 {% endif %}
 
 # Driver interface type (hostap/wired/none/nl80211/bsd);
@@ -739,4 +745,3 @@ wmm_ac_vo_cwmin=2
 wmm_ac_vo_cwmax=3
 wmm_ac_vo_txop_limit=47
 wmm_ac_vo_acm=0
-