From patchwork Tue Jun 26 03:04:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jim1_lin X-Patchwork-Id: 174295 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "maxx.shmoo.com", Issuer "CA Cert Signing Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 3BCEF2C0092 for ; Wed, 1 Aug 2012 03:35:07 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 604FC9C207; Tue, 31 Jul 2012 13:35:04 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bUUe7i8WkwrF; Tue, 31 Jul 2012 13:35:04 -0400 (EDT) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 1BDB39C1F9; Tue, 31 Jul 2012 13:35:00 -0400 (EDT) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 23D6F9C1F4 for ; Tue, 31 Jul 2012 13:34:59 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HNXR15D3oaYk for ; Tue, 31 Jul 2012 13:34:55 -0400 (EDT) Received: from mail-ey0-f202.google.com (mail-ey0-f202.google.com [209.85.215.202]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id 42C089C1F9 for ; Tue, 31 Jul 2012 13:34:55 -0400 (EDT) Received: by eaao12 with SMTP id o12so266196eaa.5 for ; Tue, 31 Jul 2012 10:34:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:date:subject:to:message-id:x-gm-message-state; bh=/MMG7PWZKvztMcp8JrNW+v7NAM624wiG+EGNFtsaLjM=; b=QYIWjo5z7adMe2cQSCU5brxITOKgatWyjqmlWiCGx6bJPXMoNzIAB9BaGT6khWqNHj +8ZibT35r1H5OC3kj/KMay1cBR3qpdftGbUTCLeb53RIT9kqiDWo2itBednOCM13Xl17 /Hont8gdOpYFHdL42HcbxwxZAwL/RMGJo9a7EYGrOYwW84s3suKr3X8+w+Dhhe2d3tp7 Bq+DZQakY0IOJwi4T5sF2tiANdoxbnka82vmglUcARRIK+jF7p8+YOFLOW4agjjMMWiT k7V5jJoIznUh2MY7vlRPI6iq7KE8TYO/DBmuBmcCkaJ3sMD7rY7s6EGVkiJ9YfiUMjin xkUQ== Received: by 10.14.205.195 with SMTP id j43mr14345536eeo.3.1343756094168; Tue, 31 Jul 2012 10:34:54 -0700 (PDT) Received: by 10.14.205.195 with SMTP id j43mr14345528eeo.3.1343756094098; Tue, 31 Jul 2012 10:34:54 -0700 (PDT) Received: from hpza10.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id 46si845345eed.1.2012.07.31.10.34.54 (version=TLSv1/SSLv3 cipher=AES128-SHA); Tue, 31 Jul 2012 10:34:54 -0700 (PDT) Received: from ushik.mtv.corp.google.com (ushik.mtv.corp.google.com [172.18.104.41]) by hpza10.eem.corp.google.com (Postfix) with ESMTP id E0BF920004E for ; Tue, 31 Jul 2012 10:34:53 -0700 (PDT) Received: by ushik.mtv.corp.google.com (Postfix, from userid 57417) id 2C9E138360; Tue, 31 Jul 2012 10:34:53 -0700 (PDT) From: jim1_lin Date: Tue, 26 Jun 2012 11:04:38 +0800 Subject: [PATCH] WPS : update dev.config_methods in wps_update_config. To: hostap@lists.shmoo.com Message-Id: <20120731173453.2C9E138360@ushik.mtv.corp.google.com> X-Gm-Message-State: ALoCoQljdg+RzsUQ/EyErdGB2yuenjRl+pFPV0l45OBX0RH9TMqAmN6e7sKuEN913gHGgr1to+q2LedAL0dYidzfjS7/TJxU3wXYmZ5eI3yddO2dXwE0gFdk0gymhF/oHBuPOruaFe2zBCoeiveh1nPknx+4gHljbo9eEZ7dgoz1AgRNci1ae/m2Hiss1nAkr/EP/ob61NzkkC4tANGvLPGbEr7sKIrPiA== X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com dev.config_methods was not updated when wps_update_config was called. Led to mismatch config methods between probe_request and M1 packets. Add missing part for it. Change-Id: I02bd016a35726c7cf05cd71840082edd677b04b8 --- wpa_supplicant/wps_supplicant.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) 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 @@ void wpas_wps_update_config(struct wpa_supplicant *wpa_s) } } 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,