WPS: Fix default virt/phy pushbutton config method setting

Instead of always adding PHY PushButton config method, only add this
if neither virtual nor physical push button is advertised.

diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
index 2d7f6324053cfc4b2fa1c141e8bf76a582fcc354..062621470d5c39663eacaba0aee82694f2713283 100644 (file)
--- a/src/wps/wps_registrar.c
+++ b/src/wps/wps_registrar.c
@@ -485,10 +485,8 @@ static void wps_set_pushbutton(u16 *methods, u16 conf_methods)
                *methods |= WPS_CONFIG_VIRT_PUSHBUTTON;
        if (conf_methods & WPS_CONFIG_PHY_PUSHBUTTON)
                *methods |= WPS_CONFIG_PHY_PUSHBUTTON;
-       if ((*methods & WPS_CONFIG_VIRT_PUSHBUTTON) !=
-           WPS_CONFIG_VIRT_PUSHBUTTON ||
-           (*methods & WPS_CONFIG_PHY_PUSHBUTTON) !=
-           WPS_CONFIG_PHY_PUSHBUTTON) {
+       if (!(*methods & (WPS_CONFIG_VIRT_PUSHBUTTON |
+                         WPS_CONFIG_PHY_PUSHBUTTON))) {
                /*
                 * Required to include virtual/physical flag, but we were not
                 * configured with push button type, so have to default to one