From patchwork Tue Mar 18 13:50:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Abinader X-Patchwork-Id: 331430 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 ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D75582C00B9 for ; Wed, 19 Mar 2014 00:42:29 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 7FC549C142; Tue, 18 Mar 2014 09:42:26 -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 ilJwi0ZNr93w; Tue, 18 Mar 2014 09:42:26 -0400 (EDT) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 5FE7A9C144; Tue, 18 Mar 2014 09:42:09 -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 8FEF99C141 for ; Tue, 18 Mar 2014 09:42:06 -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 SeuoQT7qZxbk for ; Tue, 18 Mar 2014 09:42:00 -0400 (EDT) Received: from mail-yh0-f54.google.com (mail-yh0-f54.google.com [209.85.213.54]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (not verified)) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id CACC19C0DD for ; Tue, 18 Mar 2014 09:42:00 -0400 (EDT) Received: by mail-yh0-f54.google.com with SMTP id f73so6852777yha.13 for ; Tue, 18 Mar 2014 06:42:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Yt8aek4x7pqPAfo3JENm/ekNWiN+E7oiWfM5zgtTVTM=; b=Idhfg6f2bcihEjvX+O6QJv9hf6YI9PF1wGIZ+7VxIfkgBnjMwpEvdwQCxE/Ugrycnx Drnt+Vsr4nl5VWYFYSisRAhkPgoFCGGRNLRpF4SrOMZ42Ldc9Wj7K4uKIAI47Ych2HwT wiDEqwHfxowBtE3LW04+txkNlwDguJKFVd2hXA1dJLtrcyDx0GIM4ZdOo0DM8X3p1mPW jGK01Xr072NkvRSVUseBBKrRckVOOHe7i0hcAjURMVvZoWf62+NIdR4x0TFufsjMPT6v EiTJ4uGWXUviiW4vo1yYVBlfXY4rUpa60HhtD6yY6EdPQcAGj6J+aF9kdhBM3L7Y7csb 1ARg== X-Gm-Message-State: ALoCoQmfwWc8UAUaXN1Kx7AgmE+WTaER9SVUdZsHIRdfGFC0p/FawJYbg+fbBvSvc77khRsPIUw5 X-Received: by 10.236.198.243 with SMTP id v79mr1850349yhn.87.1395150120506; Tue, 18 Mar 2014 06:42:00 -0700 (PDT) Received: from aragorn.indt.org ([189.2.128.130]) by mx.google.com with ESMTPSA id 23sm38385834yhj.5.2014.03.18.06.41.59 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 18 Mar 2014 06:42:00 -0700 (PDT) From: Eduardo Abinader To: hostap@lists.shmoo.com Subject: [PATCH 1/2] Fix radio remove works Date: Tue, 18 Mar 2014 09:50:53 -0400 Message-Id: <1395150654-28969-2-git-send-email-eduardo.abinader@openbossa.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395150654-28969-1-git-send-email-eduardo.abinader@openbossa.org> References: <1395150654-28969-1-git-send-email-eduardo.abinader@openbossa.org> X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.11 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 When radio has been previously removed and pending radio works related to an excluded interface remains, new works are not capable of being executed. That occurs when a potential P2P client fails to negotiate group formation. For some reason, the P2P device is no more capable of issuing radio works. Those checks prevent this situation, by allowing removal of previous radio works. Signed-off-by: Eduardo Abinader --- wpa_supplicant/wpa_supplicant.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 499dcb3..c74ac20 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -3176,7 +3176,8 @@ void radio_remove_works(struct wpa_supplicant *wpa_s, dl_list_for_each_safe(work, tmp, &radio->work, struct wpa_radio_work, list) { - if (type && os_strcmp(type, work->type) != 0) + if (work->wpa_s && work->wpa_s->radio && type && + os_strcmp(type, work->type) != 0) continue; /* skip other ifaces' works */