From 891bfc77ac3531f2e9c6eed27f20e9ab65d8fe24 Mon Sep 17 00:00:00 2001
From: Ruben Barkow-Kuder <rubo77@users.noreply.github.com>
Date: Mon, 25 May 2020 01:13:30 +0200
Subject: [PATCH] gluon-client-bridge: simplify boolean expressions (#2031)
---
.../lib/gluon/upgrade/320-gluon-client-bridge-wireless | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless b/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless
index 0aa257524..b65a7d572 100755
--- a/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless
+++ b/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless
@@ -25,7 +25,7 @@ local function configure_ap(radio, index, config, radio_name)
local macaddr = util.get_wlan_mac(uci, radio, index, 1)
- if not ap() or not ap.ssid() or not macaddr then
+ if not ap.ssid() or not macaddr then
return
end
@@ -58,7 +58,7 @@ local function configure_owe(radio, index, config, radio_name)
local macaddr = util.get_wlan_mac(uci, radio, index, 3)
- if not ap() or not ap.owe_ssid() or not macaddr then
+ if not ap.owe_ssid() or not macaddr then
return
end
@@ -84,7 +84,7 @@ local function configure_owe_transition_mode(config, radio_name)
return
end
- if not ap() or not ap.owe_transition_mode() then
+ if not ap.owe_transition_mode(false) then
return
end
@@ -97,7 +97,7 @@ local function configure_owe_transition_mode(config, radio_name)
local macaddr_client = uci:get('wireless', name_client, 'macaddr')
local macaddr_owe = uci:get('wireless', name_owe, 'macaddr')
- if not ssid_client or not ssid_owe or not macaddr_client or not macaddr_owe then
+ if not (ssid_client and ssid_owe and macaddr_client and macaddr_owe) then
return
end
--
GitLab