2 files changed, 8 insertions, 5 deletions
diff --git a/src/conf_mode/interfaces-openvpn.py b/src/conf_mode/interfaces-openvpn.py
index fb2d6e6d9..9bac4d759 100755
--- a/src/conf_mode/interfaces-openvpn.py
+++ b/src/conf_mode/interfaces-openvpn.py
@@ -66,6 +66,10 @@ proto {% if 'tcp-active' in protocol -%}tcp-client{% elif 'tcp-passive' in proto
 local {{ local_host }}
 {% endif %}
 
+{%- if mode == 'server' and protocol == 'udp' and not local_host %}
+multihome
+{% endif %}
+
 {%- if local_port %}
 lport {{ local_port }}
 {% endif %}
@@ -308,7 +312,7 @@ default_config_data = {
     'ncp_ciphers': '',
     'options': [],
     'persistent_tunnel': False,
-    'protocol': '',
+    'protocol': 'udp',
     'redirect_gateway': '',
     'remote_address': '',
     'remote_host': [],
@@ -512,8 +516,7 @@ def get_config():
 
     # OpenVPN operation mode
     if conf.exists('mode'):
-        mode = conf.return_value('mode')
-        openvpn['mode'] = mode
+        openvpn['mode'] = conf.return_value('mode')
 
     # Additional OpenVPN options
     if conf.exists('openvpn-option'):
diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py
index f7ecb098e..3c20c3025 100755
--- a/src/conf_mode/interfaces-wireless.py
+++ b/src/conf_mode/interfaces-wireless.py
@@ -799,7 +799,7 @@ default_config_data = {
     'cap_vht_center_freq_2' : '',
     'cap_vht_chan_set_width' : '',
     'cap_vht_ldpc' : False,
-    'cap_vht_link_adaptation' : False,
+    'cap_vht_link_adaptation' : '',
     'cap_vht_max_mpdu_exp' : '',
     'cap_vht_max_mpdu' : '',
     'cap_vht_short_gi' : [],
@@ -1043,7 +1043,7 @@ def get_config():
     # VHT link adaptation capabilities
     if conf.exists('capabilities vht link-adaptation'):
         wifi['cap_vht'] = True
-        wifi['cap_vht_link_adaptation'] = True
+        wifi['cap_vht_link_adaptation'] = conf.return_value('capabilities vht link-adaptation')
 
     # Set the maximum length of A-MPDU pre-EOF padding that the station can receive
     if conf.exists('capabilities vht max-mpdu-exp'):