From patchwork Wed Dec 14 10:06:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Vandeputte X-Patchwork-Id: 705633 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tdsjp2msYz9t0v for ; Wed, 14 Dec 2016 21:09:02 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ncentric.com header.i=@ncentric.com header.b="KYp6F9Hd"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cH6TW-0005lD-Kz; Wed, 14 Dec 2016 10:07:50 +0000 Received: from mail-wj0-x22c.google.com ([2a00:1450:400c:c01::22c]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cH6TU-0005aj-Ep for hostap@lists.infradead.org; Wed, 14 Dec 2016 10:07:49 +0000 Received: by mail-wj0-x22c.google.com with SMTP id tk12so24783275wjb.3 for ; Wed, 14 Dec 2016 02:07:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ncentric.com; s=google; h=from:to:cc:subject:date:message-id; bh=ozp6oq3eHnuUHSSs9Tragd909Od93yzhw6jSh2/OmqQ=; b=KYp6F9HdKfV/VvyK6ANgOjJurErkRDc/UrzQuL0tNLdniBLjdGdXclAf5PCFYNpGyh 6MnVeyR2d/YR/PMl0H+NlWW+KVDEff2L/ZAfp/fIxNkcMTW66YkZkHCupO3EComhQO+9 CLDHdm/4zl+nt2jZLZGABDN3ObPCV1VjQ41Yw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ozp6oq3eHnuUHSSs9Tragd909Od93yzhw6jSh2/OmqQ=; b=HwQE+2z+2YtaMsbEZQo00KmtgA301hjsHFtnLC0yKBaoS7ofOCldPnouI1zUWAKStN oC33ZwfiINpwnXQS9hiRK8tmrMGiH22mr1p4tVgdeNXUpKfEmCbv9vzlkLL3da69aS6a 0Y2triwXQwPMdWyC5g1zx3u6bmZI2PxcSOdYIEAvuFpYR5rmXJYNBDNQwK8mrevvtf3j /Q1Te9NhioD9SwdwSSqYwradypUTUbvClHgcE7xaoX1F5/YEr1GxN37D4OA/kw4Yrbte NX3gk7xykXCzq7bde9HjOuywciLoi4pi2x+ddFSQ+/5E88bvtrH382/lhYRKsuvxu6WW JerA== X-Gm-Message-State: AKaTC039DjUYowQbBtKWZZ+pB85OzK8ZQovC0JCl2Gwc9Jyij6R7HkwEE2JZhUKpdocko8Pw X-Received: by 10.28.29.86 with SMTP id d83mr6191307wmd.75.1481710046389; Wed, 14 Dec 2016 02:07:26 -0800 (PST) Received: from localhost.localdomain (d515300d8.static.telenet.be. [81.83.0.216]) by smtp.googlemail.com with ESMTPSA id m145sm6814028wma.3.2016.12.14.02.07.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Dec 2016 02:07:25 -0800 (PST) From: Koen Vandeputte To: hostap@lists.infradead.org Subject: [PATCH] Fix: Compiler warning on disabled PMKSA_CACHE_EXTERNAL Date: Wed, 14 Dec 2016 11:06:55 +0100 Message-Id: <1481710015-14657-1-git-send-email-koen.vandeputte@ncentric.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161214_020748_720012_477A979D X-CRM114-Status: UNSURE ( 8.40 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c01:0:0:0:22c listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: j@w1.fi, Koen Vandeputte MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Fixes a compiler warning when CONFIG_PMKSA_CACHE_EXTERNAL and CONFIG_IEEE8021X_EAPOL are disabled. All functions calling these 2 and it's own dependencies are embraced by one of these macro's, resulting in the warning when disabled. ../src/rsn_supp/wpa.c: In function 'wpa_sm_pmksa_cache_head': ../src/rsn_supp/wpa.c:3036:9: warning: implicit declaration of function 'pmksa_cache_head' [-Wimplicit-function-declaration] return pmksa_cache_head(sm->pmksa); ^~~~~~~~~~~~~~~~ ../src/rsn_supp/wpa.c:3036:9: warning: return makes pointer from integer without a cast [-Wint-conversion] return pmksa_cache_head(sm->pmksa); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ../src/rsn_supp/wpa.c: In function 'wpa_sm_pmksa_cache_add_entry': ../src/rsn_supp/wpa.c:3044:9: warning: implicit declaration of function 'pmksa_cache_add_entry' [-Wimplicit-function-declaration] return pmksa_cache_add_entry(sm->pmksa, entry); ^~~~~~~~~~~~~~~~~~~~~ ../src/rsn_supp/wpa.c:3044:9: warning: return makes pointer from integer without a cast [-Wint-conversion] return pmksa_cache_add_entry(sm->pmksa, entry); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Koen Vandeputte --- src/rsn_supp/wpa.c | 3 ++- src/rsn_supp/wpa.h | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c index 8093634..e89d70a 100644 --- a/src/rsn_supp/wpa.c +++ b/src/rsn_supp/wpa.c @@ -3027,7 +3027,7 @@ int wpa_sm_pmksa_cache_list(struct wpa_sm *sm, char *buf, size_t len) return pmksa_cache_list(sm->pmksa, buf, len); } - +#ifdef CONFIG_PMKSA_CACHE_EXTERNAL struct rsn_pmksa_cache_entry * wpa_sm_pmksa_cache_head(struct wpa_sm *sm) { return pmksa_cache_head(sm->pmksa); @@ -3041,6 +3041,7 @@ wpa_sm_pmksa_cache_add_entry(struct wpa_sm *sm, return pmksa_cache_add_entry(sm->pmksa, entry); } +#endif /* CONFIG_PMKSA_CACHE_EXTERNAL */ void wpa_sm_drop_sa(struct wpa_sm *sm) { diff --git a/src/rsn_supp/wpa.h b/src/rsn_supp/wpa.h index d1a810b..ecfb7cf 100644 --- a/src/rsn_supp/wpa.h +++ b/src/rsn_supp/wpa.h @@ -149,10 +149,14 @@ int wpa_sm_rx_eapol(struct wpa_sm *sm, const u8 *src_addr, const u8 *buf, size_t len); int wpa_sm_parse_own_wpa_ie(struct wpa_sm *sm, struct wpa_ie_data *data); int wpa_sm_pmksa_cache_list(struct wpa_sm *sm, char *buf, size_t len); + +#ifdef CONFIG_PMKSA_CACHE_EXTERNAL struct rsn_pmksa_cache_entry * wpa_sm_pmksa_cache_head(struct wpa_sm *sm); struct rsn_pmksa_cache_entry * wpa_sm_pmksa_cache_add_entry(struct wpa_sm *sm, struct rsn_pmksa_cache_entry * entry); +#endif /*CONFIG_PMKSA_CACHE_EXTERNAL */ + void wpa_sm_drop_sa(struct wpa_sm *sm); int wpa_sm_has_ptk(struct wpa_sm *sm);