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.
This commit is contained in:
Jouni Malinen 2011-08-11 16:51:40 +03:00 committed by Jouni Malinen
parent ccb941e6da
commit 59639fa112

View file

@ -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