commit 5e4315286bf0aa8a42495674f14e1cefedeeb4ec
author Irfan Sheriff <isheriff@google.com> Wed Aug 01 13:01:39 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 01 13:01:40 2012 -0700
tree 4d7f18f96959577630da786f23a3dd2bad9bb583
parent ff2bda64334bb7dcc98816e4ac4b515cd2a9667b
parent e78e767aea5576ec0ba7edadfe25fd9dc7dce48f

Merge "Use bssid instead of pending_bssid" into jb-mr1-dev

wpa_supplicant/wps_supplicant.c

diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index 7356d1a..0873b1a 100644
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -1760,6 +1760,7 @@
 		}
 	}
 	wps->config_methods = wps_fix_config_methods(wps->config_methods);
+	wps->dev.config_methods = wps->config_methods;
 
 	if (wpa_s->conf->changed_parameters & CFG_CHANGED_DEVICE_TYPE)
 		os_memcpy(wps->dev.pri_dev_type, wpa_s->conf->device_type,