From patchwork Wed Apr 3 12:16:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Otcheretianski, Andrei" X-Patchwork-Id: 1075570 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="r483WZ2M"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Yzbj6RQNz9sRs for ; Wed, 3 Apr 2019 19:22:57 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=g5BVyTXeRLEOUdLFQ/W3EsBPC55hl64a/5ScszSqq3w=; b=r483WZ2MZuOj8q h/6hhdY0A3XJTn34j9a3DT/1gLgJtV5Xek7AIrZsSnY5htz4hgYLPKGluYDHmc7xEc6LtnUjaYzcY /5DbP64gkgEJDQpSxXPB5sdzQj97gxsbGbqrfq2pWZTTXF6rt8GYkP1NTJ5EE5fUi+IM6Gtw/Ycvh AJng4QcGY2d8xwBYJM6rBlsjlMBCk7WXq7eWKfxuAyZPgBOIUpd2r0cCii037fcL2VO8ZHjlHwtJo +1kmulDBvtg9ZYjbCge3yGKgWkPTw3U98TYaigddOOOIZIifqdsoqRmKTGxcr01TTIR3pI1lRx6sg 9lQ0XXakS/itN+pufwjA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hBbAd-0001Xo-TV; Wed, 03 Apr 2019 08:22:55 +0000 Received: from mga07.intel.com ([134.134.136.100]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hBbAb-0001W1-0v for hostap@lists.infradead.org; Wed, 03 Apr 2019 08:22:54 +0000 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Apr 2019 01:22:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,304,1549958400"; d="scan'208";a="220098087" Received: from andrei-xps-12-9q33.jer.intel.com ([10.12.190.129]) by orsmga001.jf.intel.com with ESMTP; 03 Apr 2019 01:22:51 -0700 From: Andrei Otcheretianski To: hostap@lists.infradead.org Subject: [PATCH] nl80211: Remove unreachable code in add_ifidx() Date: Wed, 3 Apr 2019 15:16:13 +0300 Message-Id: <20190403121615.4094-2-andrei.otcheretianski@intel.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190403121615.4094-1-andrei.otcheretianski@intel.com> References: <20190403121615.4094-1-andrei.otcheretianski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190403_012253_115577_F409D4C0 X-CRM114-Status: GOOD ( 10.87 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [134.134.136.100 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 2.4 DATE_IN_FUTURE_03_06 Date: is 3 to 6 hours after Received: date X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ilan Peer Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Ilan Peer Signed-off-by: Ilan Peer --- src/drivers/driver_nl80211.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 52cef41865..28d123e570 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -6658,12 +6658,7 @@ static void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx, else drv->if_indices_reason = old_reason; } - if (!drv->if_indices || !drv->if_indices_reason) { - wpa_printf(MSG_ERROR, "Failed to reallocate memory for " - "interfaces"); - wpa_printf(MSG_ERROR, "Ignoring EAPOL on interface %d", ifidx); - return; - } + if (!old) os_memcpy(drv->if_indices, drv->default_if_indices, sizeof(drv->default_if_indices));