From patchwork Fri Mar 17 14:27:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matteo Croce X-Patchwork-Id: 740332 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 3vl7471rv1z9s2s for ; Sat, 18 Mar 2017 01:28:23 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="iQwzZufM"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="d5KIiStq"; dkim-atps=neutral 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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:In-Reply-To: References:List-Owner; bh=s/Q0oBShZ4zmL1Povod27840dLYKLL0NAwAp4JyyHkI=; b=iQw zZufM13/RxzDA6RLTvqHoTIAtN0r6rwQsAWS1d30uyZlAYojHOj1MFfef2XgPPPzBpFSLGX5K54tD 1d+GGMfXSFmA5FMX9ilzqcBN5/VAhgHTZz1Qbn3prnshfw9jCnRf6P4/Td2AbWsie8GtwJ8WsWhPi w1LEMz9XIvtPNlVnk81j5Fyx5stdxaSeGoLxKkWuHvR4fVoDDENCR0HDARM7FyLYcUOKqpuUhjCFN tSNVSNIchOlFrKgD1QWokCDq4b3pAmDwJysHPNxaiVkFK18jH/KooyAHElJXE0ninNga6PipwbpRl JRbP0Tv6kSbOg4A4Ob/gO3Fv0YZHc9A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cosrd-0004bt-Rz; Fri, 17 Mar 2017 14:28:21 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cosrb-0004b3-U5 for hostap@bombadil.infradead.org; Fri, 17 Mar 2017 14:28:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=DqMDnq1V3gANx3LqTGFqHd3TbD6qYlb4JxwuBdrINwM=; b=d5KIiStqYX5U3CHIsMWhW/Yqx 0mzI2V7W4VtgzEB6n1AUiytEg5zXcuBOgRxs5TGxVDegpRADUQbIzBRtL0eNixWfc5a+7VcsgQ3DP JdGSVBB+x47TJFacidj0MPpY0qCm0D1k77+MBvOWVyT/l5VfFpMsLIHFXA0fjI0aSwFqTTsbc1CEU PXHzaC1XFkyWG0KWwbGW4Q2YnGBXC/kEaWTyiEKRQTm+IrIrtm5aMyobDT9kqp2cnebPRmfcW8kJJ Rfp8wBe9WJ9nY5TC14lzEWFGCA549kPkHKurde4l3Oxj+JXZ0CeUETWrf3ihc3V9OwaeWRYqKi5cx cr28Fj82w==; Received: from mail-wm0-f44.google.com ([74.125.82.44]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cosrY-0003Hp-M0 for hostap@lists.infradead.org; Fri, 17 Mar 2017 14:28:17 +0000 Received: by mail-wm0-f44.google.com with SMTP id n11so16958856wma.1 for ; Fri, 17 Mar 2017 07:27:55 -0700 (PDT) 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=DqMDnq1V3gANx3LqTGFqHd3TbD6qYlb4JxwuBdrINwM=; b=dGOfpEAJxUWGeKnTrSM2jOc0oIHU/pWu6W/7EkG08SLwvUPFKxFOrXWD0fUleotRIZ /QrVa2X8C+fJYj7wKk8baQh6r/3qkfwIeFKap6rlCVybVBH8Gr9mts/RHfQBiY7iviDO 50fAurREh0wT2sKRHN5kOTiIC3noTVkOr0yKN83X5+ZF60wKyJ0+4NQAl08GXPsnOM/l i/VpMvP/wiKbgpe18CHdG2s2aU3EoQrbWycaVm1GQa5l+WAXZXwM16Y2o2tyEo3O5HrX v42aEl5iTC/OO6xyRuTboPdZ6ZZbM8n76ZfHKjsOBRGZDaIGGuL1zp2YHcZXKoeVCHyN w2LA== X-Gm-Message-State: AFeK/H2/TZpaFXrNlJw+kYXhO+IwxXO1gjw7tHHV0kVpyE8Pm3PG5l9uinN8mZRrjca7cg== X-Received: by 10.28.96.194 with SMTP id u185mr3039240wmb.82.1489760874020; Fri, 17 Mar 2017 07:27:54 -0700 (PDT) Received: from matteo-desktop.teknoraver.net (net-47-53-225-207.cust.vodafonedsl.it. [47.53.225.207]) by smtp.gmail.com with ESMTPSA id n187sm2869220wmd.4.2017.03.17.07.27.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2017 07:27:53 -0700 (PDT) From: Matteo Croce To: hostap@lists.infradead.org Subject: [PATCH] don't bring the interface down if WoWLAN is enabled Date: Fri, 17 Mar 2017 15:27:45 +0100 Message-Id: <20170317142745.10217-1-matteo.croce@canonical.com> X-Mailer: git-send-email 2.9.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170317_102816_826722_207B9016 X-CRM114-Status: GOOD ( 13.07 ) X-Spam-Score: -1.5 (-) X-Spam-Report: SpamAssassin version 3.4.1 on merlin.infradead.org summary: Content analysis details: (-1.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (technoboy85[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [74.125.82.44 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [74.125.82.44 listed in wl.mailspike.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (technoboy85[at]gmail.com) 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -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.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 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: Matteo Croce MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org --- src/drivers/driver.h | 7 +++++++ src/drivers/driver_nl80211.c | 38 ++++++++++++++++++++++++++++++++++++++ wpa_supplicant/wpa_supplicant.c | 7 ++++++- 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/src/drivers/driver.h b/src/drivers/driver.h index fc2593e..4c54987 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -3164,6 +3164,13 @@ struct wpa_driver_ops { unsigned int val); /** + * get_wowlan - Get wake-on-wireless status + * @priv: Private driver interface data + * Returns: 1 if enabled, 0 if not + */ + int (*get_wowlan)(void *priv); + + /** * set_wowlan - Set wake-on-wireless triggers * @priv: Private driver interface data * @triggers: wowlan triggers diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index bceeba2..fafbf2c 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -8613,6 +8613,43 @@ static int nl80211_set_qos_map(void *priv, const u8 *qos_map_set, } +static int get_wowlan_handler(struct nl_msg *msg, void *arg) +{ + struct nlattr *tb[NL80211_ATTR_MAX + 1]; + struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); + int *wowlan_enabled = arg; + + nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), + genlmsg_attrlen(gnlh, 0), NULL); + + *wowlan_enabled = !!tb[NL80211_ATTR_WOWLAN_TRIGGERS]; + + return NL_SKIP; +} + + +static int nl80211_get_wowlan(void *priv) +{ + struct i802_bss *bss = priv; + struct wpa_driver_nl80211_data *drv = bss->drv; + struct nl_msg *msg; + int wowlan_enabled; + + wpa_printf(MSG_DEBUG, "nl80211: Querying wowlan setting"); + + msg = nl80211_drv_msg(drv, 0, NL80211_CMD_GET_WOWLAN); + + if (!send_and_recv_msgs(drv, msg, get_wowlan_handler, &wowlan_enabled)) { + wpa_printf(MSG_DEBUG, "WoWLAN is %s", wowlan_enabled ? "enabled" : "disabled"); + if (wowlan_enabled) + return 1; + } else + wpa_printf(MSG_DEBUG, "nl80211: wowlan query failed"); + + return 0; +} + + static int nl80211_set_wowlan(void *priv, const struct wowlan_triggers *triggers) { @@ -10075,6 +10112,7 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = { #endif /* ANDROID */ .vendor_cmd = nl80211_vendor_cmd, .set_qos_map = nl80211_set_qos_map, + .get_wowlan = nl80211_get_wowlan, .set_wowlan = nl80211_set_wowlan, .set_mac_addr = nl80211_set_mac_addr, #ifdef CONFIG_MESH diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index e65441d..da06200 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -5386,7 +5386,12 @@ int wpa_supplicant_remove_iface(struct wpa_global *global, global->p2p_group_formation = NULL; if (global->p2p_invite_group == wpa_s) global->p2p_invite_group = NULL; - wpa_supplicant_deinit_iface(wpa_s, 1, terminate); + + /* Don't bring the interface down if WoWLAN is enabled */ + if (wpa_s->driver->get_wowlan && !wpa_s->driver->get_wowlan(wpa_s->drv_priv)) + wpa_supplicant_deinit_iface(wpa_s, 1, terminate); + else + wpa_dbg(wpa_s, MSG_INFO, "Leaving up as WoWLAN is enabled"); #ifdef CONFIG_MESH if (mesh_if_created) {