From patchwork Wed Nov 1 12:12:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amitkumar Karwar X-Patchwork-Id: 10036299 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AC4BD603B5 for ; Wed, 1 Nov 2017 12:19:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9869A28541 for ; Wed, 1 Nov 2017 12:19:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8AED428B0D; Wed, 1 Nov 2017 12:19:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 25BC828541 for ; Wed, 1 Nov 2017 12:19:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932209AbdKAMTq (ORCPT ); Wed, 1 Nov 2017 08:19:46 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:56926 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752141AbdKAMTp (ORCPT ); Wed, 1 Nov 2017 08:19:45 -0400 Received: by mail-pg0-f68.google.com with SMTP id m18so1959950pgd.13 for ; Wed, 01 Nov 2017 05:19:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nZq9NC9Zcv0WlZQQCwhnHPGS7rSj0r+6twDu4mKy8Ao=; b=dpkCJTJtvdalRa1431K+zhquPIx1oeLxzUmVb4oQzBDw62A/BaRZlkJs/8e1g7BZFw r64uabFGsWd04BYbLOsD8/9NPAL8Jbmy9o4pLNmd1bsK1IMg4F94er4u81aCCh+sUfBw 6Cv59/PHJ+PLL7nI01cMcJSIlXNGf2i27n85RsBsGupjBEc+4jAVLO+low3d/uAaF2iy HtMV4/3J8apecyX5dr3qkhhBQ29scnDCApRZ6Q4QLTz1ke1apJPI+KamwJ1+T7MeDOES Jx2eLBSaw08h4grhvmrFxTdWfDdK9s3Jy/YUt6YRmZDoyFpazoQT0RL0VRv5dBuau7Da QY4Q== 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:in-reply-to :references; bh=nZq9NC9Zcv0WlZQQCwhnHPGS7rSj0r+6twDu4mKy8Ao=; b=LioVGUP/fVXFYJjQV5sUIdLtWWQg4SVwi71EmCus2k/RXR5iFPddaL//m1VgQw2+0N rJPrd5x5usd2dl+weHyMMfN2G9Kk8isC3MoLrOIIQOk5Vr5od5vBsh/0+m3umksJ4G/Y dNpaEJBpN/u3OKMCOduCYHvYq8hWNRR5Z1ggkvV1AJ/wS/gYn5S7fm2LSZto4HSUI/75 lkb2FYgNxMkQg4FMgjacVcm8ok5EiZc5B56LvkZ/f6PkcyzkdF+hr7k+OK1MlcAMZNQO 9RIxhCqZo8W57eiOvYIahWn7TNE3WPqE2NgKOpD7+KYf8+j7y9cOObXyLcL9ASJi2qI0 WiAA== X-Gm-Message-State: AMCzsaWK6pls1HchYZuXl1dhT4Tg2dfCY82wiDsdaz2YzUMZb/8iqFqD LNrMqAdA5k6r1JMXQkQwCOI= X-Google-Smtp-Source: ABhQp+TgOtp73CGIKEDI3+hFO3sd51dIxuSmM4QdE+VEW9HA/ZxQtoJ6Y5SKMU4e9RRj7tbm5LpF2Q== X-Received: by 10.99.97.67 with SMTP id v64mr5874934pgb.89.1509538785019; Wed, 01 Nov 2017 05:19:45 -0700 (PDT) Received: from cpu185.redpinesignals.com ([203.196.161.90]) by smtp.gmail.com with ESMTPSA id s9sm1340997pgc.18.2017.11.01.05.19.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Nov 2017 05:19:44 -0700 (PDT) From: Amitkumar Karwar To: Kalle Valo Cc: linux-wireless@vger.kernel.org, Amitkumar Karwar , Prameela Rani Garnepudi Subject: [PATCH 2/2] rsi: fix kbuild reported build errors with CONFIG_PM off Date: Wed, 1 Nov 2017 17:42:45 +0530 Message-Id: <1509538365-31532-2-git-send-email-amitkarwar@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1509538365-31532-1-git-send-email-amitkarwar@gmail.com> References: <1509538365-31532-1-git-send-email-amitkarwar@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Amitkumar Karwar Some wowlan related code was outside CONFIG_PM flag which caused these build errors. They are fixed by moving that code under CONFIG_PM flag. Reported-by: kbuild test robot Fixes: ef71ed0608c ("rsi: sdio: Add WOWLAN support for S5 shutdown state") Fixes: a24e35fcee0 ("rsi: sdio: Add WOWLAN support for S4 hibernate state") Fixes: e1ced6422a3 ("rsi: sdio: add WOWLAN support for S3 suspend state") Signed-off-by: Amitkumar Karwar --- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 5 ++++- drivers/net/wireless/rsi/rsi_91x_mgmt.c | 2 ++ drivers/net/wireless/rsi/rsi_common.h | 2 ++ drivers/net/wireless/rsi/rsi_mgmt.h | 2 ++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_mac80211.c b/drivers/net/wireless/rsi/rsi_91x_mac80211.c index 36c63e9..32f5cb4 100644 --- a/drivers/net/wireless/rsi/rsi_91x_mac80211.c +++ b/drivers/net/wireless/rsi/rsi_91x_mac80211.c @@ -1752,6 +1752,7 @@ static int rsi_mac80211_cancel_roc(struct ieee80211_hw *hw) return 0; } +#ifdef CONFIG_PM static const struct wiphy_wowlan_support rsi_wowlan_support = { .flags = WIPHY_WOWLAN_ANY | WIPHY_WOWLAN_MAGIC_PKT | @@ -1824,7 +1825,6 @@ int rsi_config_wowlan(struct rsi_hw *adapter, struct cfg80211_wowlan *wowlan) } EXPORT_SYMBOL(rsi_config_wowlan); -#ifdef CONFIG_PM static int rsi_mac80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) { @@ -1977,7 +1977,10 @@ int rsi_mac80211_attach(struct rsi_common *common) wiphy->features |= NL80211_FEATURE_INACTIVITY_TIMER; wiphy->reg_notifier = rsi_reg_notify; +#ifdef CONFIG_PM wiphy->wowlan = &rsi_wowlan_support; +#endif + wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST); /* Wi-Fi direct parameters */ diff --git a/drivers/net/wireless/rsi/rsi_91x_mgmt.c b/drivers/net/wireless/rsi/rsi_91x_mgmt.c index d38a09f..46c9d54 100644 --- a/drivers/net/wireless/rsi/rsi_91x_mgmt.c +++ b/drivers/net/wireless/rsi/rsi_91x_mgmt.c @@ -1597,6 +1597,7 @@ static int rsi_send_beacon(struct rsi_common *common) return 0; } +#ifdef CONFIG_PM int rsi_send_wowlan_request(struct rsi_common *common, u16 flags, u16 sleep_status) { @@ -1630,6 +1631,7 @@ int rsi_send_wowlan_request(struct rsi_common *common, u16 flags, return rsi_send_internal_mgmt_frame(common, skb); } +#endif /** * rsi_handle_ta_confirm_type() - This function handles the confirm frames. diff --git a/drivers/net/wireless/rsi/rsi_common.h b/drivers/net/wireless/rsi/rsi_common.h index 70b8b4b..d07dbba 100644 --- a/drivers/net/wireless/rsi/rsi_common.h +++ b/drivers/net/wireless/rsi/rsi_common.h @@ -83,7 +83,9 @@ u16 rsi_get_connected_channel(struct ieee80211_vif *vif); struct rsi_hw *rsi_91x_init(void); void rsi_91x_deinit(struct rsi_hw *adapter); int rsi_read_pkt(struct rsi_common *common, s32 rcv_pkt_len); +#ifdef CONFIG_PM int rsi_config_wowlan(struct rsi_hw *adapter, struct cfg80211_wowlan *wowlan); +#endif struct rsi_sta *rsi_find_sta(struct rsi_common *common, u8 *mac_addr); struct ieee80211_vif *rsi_get_vif(struct rsi_hw *adapter, u8 *mac); void rsi_roc_timeout(struct timer_list *t); diff --git a/drivers/net/wireless/rsi/rsi_mgmt.h b/drivers/net/wireless/rsi/rsi_mgmt.h index 76337ce..389094a 100644 --- a/drivers/net/wireless/rsi/rsi_mgmt.h +++ b/drivers/net/wireless/rsi/rsi_mgmt.h @@ -668,8 +668,10 @@ int rsi_band_check(struct rsi_common *common, struct ieee80211_channel *chan); int rsi_send_rx_filter_frame(struct rsi_common *common, u16 rx_filter_word); int rsi_send_radio_params_update(struct rsi_common *common); int rsi_set_antenna(struct rsi_common *common, u8 antenna); +#ifdef CONFIG_PM int rsi_send_wowlan_request(struct rsi_common *common, u16 flags, u16 sleep_status); +#endif int rsi_send_ps_request(struct rsi_hw *adapter, bool enable, struct ieee80211_vif *vif); #endif