package/kernel/mac80211/patches/970-rsi-fix-kbuild-reported-build-errors-with-CONFIG_PM-off

   1 From e6b3b2ed3d270b3c7080c9cf7d28636dc74b0387 Mon Sep 17 00:00:00 2001
   2 From: Amitkumar Karwar <amit.karwar@redpinesignals.com>
   3 Date: Wed, 1 Nov 2017 17:42:45 +0530
   4 Subject: rsi: fix kbuild reported build errors with CONFIG_PM off
   5
   6 Some wowlan related code was outside CONFIG_PM flag which caused these
   7 build errors. They are fixed by moving that code under CONFIG_PM flag.
   8
   9 Reported-by: kbuild test robot <fengguang.wu@intel.com>
  10 Fixes: ef71ed0608c ("rsi: sdio: Add WOWLAN support for S5 shutdown state")
  11 Fixes: a24e35fcee0 ("rsi: sdio: Add WOWLAN support for S4 hibernate state")
  12 Fixes: e1ced6422a3 ("rsi: sdio: add WOWLAN support for S3 suspend state")
  13 Signed-off-by: Amitkumar Karwar <amit.karwar@redpinesignals.com>
  14 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  15 ---
  16  drivers/net/wireless/rsi/rsi_91x_mac80211.c | 5 ++++-
  17  drivers/net/wireless/rsi/rsi_91x_mgmt.c     | 2 ++
  18  drivers/net/wireless/rsi/rsi_common.h       | 2 ++
  19  drivers/net/wireless/rsi/rsi_mgmt.h         | 2 ++
  20  4 files changed, 10 insertions(+), 1 deletion(-)
  21
  22 --- a/drivers/net/wireless/rsi/rsi_91x_mac80211.c
  23 +++ b/drivers/net/wireless/rsi/rsi_91x_mac80211.c
  24 @@ -1752,6 +1752,7 @@ static int rsi_mac80211_cancel_roc(struc
  25         return 0;
  26  }
  27
  28 +#ifdef CONFIG_PM
  29  static const struct wiphy_wowlan_support rsi_wowlan_support = {
  30         .flags = WIPHY_WOWLAN_ANY |
  31                  WIPHY_WOWLAN_MAGIC_PKT |
  32 @@ -1824,7 +1825,6 @@ int rsi_config_wowlan(struct rsi_hw *ada
  33  }
  34  EXPORT_SYMBOL(rsi_config_wowlan);
  35
  36 -#ifdef CONFIG_PM
  37  static int rsi_mac80211_suspend(struct ieee80211_hw *hw,
  38                                 struct cfg80211_wowlan *wowlan)
  39  {
  40 @@ -1977,7 +1977,10 @@ int rsi_mac80211_attach(struct rsi_commo
  41         wiphy->features |= NL80211_FEATURE_INACTIVITY_TIMER;
  42         wiphy->reg_notifier = rsi_reg_notify;
  43
  44 +#ifdef CONFIG_PM
  45         wiphy->wowlan = &rsi_wowlan_support;
  46 +#endif
  47 +
  48         wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
  49
  50         /* Wi-Fi direct parameters */
  51 --- a/drivers/net/wireless/rsi/rsi_91x_mgmt.c
  52 +++ b/drivers/net/wireless/rsi/rsi_91x_mgmt.c
  53 @@ -1597,6 +1597,7 @@ static int rsi_send_beacon(struct rsi_co
  54         return 0;
  55  }
  56
  57 +#ifdef CONFIG_PM
  58  int rsi_send_wowlan_request(struct rsi_common *common, u16 flags,
  59                             u16 sleep_status)
  60  {
  61 @@ -1630,6 +1631,7 @@ int rsi_send_wowlan_request(struct rsi_c
  62
  63         return rsi_send_internal_mgmt_frame(common, skb);
  64  }
  65 +#endif
  66
  67  /**
  68   * rsi_handle_ta_confirm_type() - This function handles the confirm frames.
  69 --- a/drivers/net/wireless/rsi/rsi_common.h
  70 +++ b/drivers/net/wireless/rsi/rsi_common.h
  71 @@ -83,7 +83,9 @@ u16 rsi_get_connected_channel(struct iee
  72  struct rsi_hw *rsi_91x_init(void);
  73  void rsi_91x_deinit(struct rsi_hw *adapter);
  74  int rsi_read_pkt(struct rsi_common *common, s32 rcv_pkt_len);
  75 +#ifdef CONFIG_PM
  76  int rsi_config_wowlan(struct rsi_hw *adapter, struct cfg80211_wowlan *wowlan);
  77 +#endif
  78  struct rsi_sta *rsi_find_sta(struct rsi_common *common, u8 *mac_addr);
  79  struct ieee80211_vif *rsi_get_vif(struct rsi_hw *adapter, u8 *mac);
  80  void rsi_roc_timeout(struct timer_list *t);
  81 --- a/drivers/net/wireless/rsi/rsi_mgmt.h
  82 +++ b/drivers/net/wireless/rsi/rsi_mgmt.h
  83 @@ -668,8 +668,10 @@ int rsi_band_check(struct rsi_common *co
  84  int rsi_send_rx_filter_frame(struct rsi_common *common, u16 rx_filter_word);
  85  int rsi_send_radio_params_update(struct rsi_common *common);
  86  int rsi_set_antenna(struct rsi_common *common, u8 antenna);
  87 +#ifdef CONFIG_PM
  88  int rsi_send_wowlan_request(struct rsi_common *common, u16 flags,
  89                             u16 sleep_status);
  90 +#endif
  91  int rsi_send_ps_request(struct rsi_hw *adapter, bool enable,
  92                         struct ieee80211_vif *vif);
  93  #endif