From: Emmanuel Grumbach <egrumbach@gmail.com>
To: linux-wireless@vger.kernel.org
Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Subject: [PATCH 61/62] iwlwifi: mvm: remove iwl_mvm_power_mac_disable
Date: Mon, 3 Feb 2014 22:58:07 +0200 [thread overview]
Message-ID: <1391461088-8082-61-git-send-email-egrumbach@gmail.com> (raw)
In-Reply-To: <CANUX_P2BFLVRL-DFsTWA56zLJsRcn_dZhVdCChaQs2ZLWiBv3g@mail.gmail.com>
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Its logic can be implemented with
iwl_mvm_power_mac_update_mode.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 +-
drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 -
drivers/net/wireless/iwlwifi/mvm/power.c | 30 ---------------------------
3 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 01b4500..9d29069 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -717,7 +717,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
if (ret)
goto out_release;
- iwl_mvm_power_mac_disable(mvm, vif);
+ iwl_mvm_power_mac_update_mode(mvm, vif);
/* beacon filtering */
ret = iwl_mvm_disable_beacon_filter(mvm, vif, CMD_SYNC);
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index 0c12c32..bf6b602 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -814,7 +814,6 @@ int iwl_power_legacy_set_cam_mode(struct iwl_mvm *mvm);
int iwl_mvm_power_mac_update_mode(struct iwl_mvm *mvm,
struct ieee80211_vif *vif);
-int iwl_mvm_power_mac_disable(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
int iwl_mvm_power_update_device(struct iwl_mvm *mvm);
void iwl_mvm_power_update_binding(struct iwl_mvm *mvm,
struct ieee80211_vif *vif, bool assign);
diff --git a/drivers/net/wireless/iwlwifi/mvm/power.c b/drivers/net/wireless/iwlwifi/mvm/power.c
index 2eea5b3..5671b83 100644
--- a/drivers/net/wireless/iwlwifi/mvm/power.c
+++ b/drivers/net/wireless/iwlwifi/mvm/power.c
@@ -461,36 +461,6 @@ int iwl_mvm_power_mac_update_mode(struct iwl_mvm *mvm,
return iwl_mvm_update_beacon_abort(mvm, vif, ba_enable);
}
-int iwl_mvm_power_mac_disable(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
-{
- struct iwl_mac_power_cmd cmd = {};
- struct iwl_mvm_vif *mvmvif __maybe_unused =
- iwl_mvm_vif_from_mac80211(vif);
-
- if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_PM_CMD_SUPPORT))
- return 0;
-
- if (vif->type != NL80211_IFTYPE_STATION || vif->p2p)
- return 0;
-
- cmd.id_and_color = cpu_to_le32(FW_CMD_ID_AND_COLOR(mvmvif->id,
- mvmvif->color));
-
- if (iwlmvm_mod_params.power_scheme != IWL_POWER_SCHEME_CAM)
- cmd.flags |= cpu_to_le16(POWER_FLAGS_POWER_SAVE_ENA_MSK);
-
-#ifdef CONFIG_IWLWIFI_DEBUGFS
- if (mvmvif->dbgfs_pm.mask & MVM_DEBUGFS_PM_DISABLE_POWER_OFF &&
- mvmvif->dbgfs_pm.disable_power_off)
- cmd.flags &= cpu_to_le16(~POWER_FLAGS_POWER_SAVE_ENA_MSK);
- memcpy(&mvmvif->mac_pwr_cmd, &cmd, sizeof(cmd));
-#endif
- iwl_mvm_power_log(mvm, &cmd);
-
- return iwl_mvm_send_cmd_pdu(mvm, MAC_PM_POWER_TABLE, CMD_ASYNC,
- sizeof(cmd), &cmd);
-}
-
static int _iwl_mvm_power_update_device(struct iwl_mvm *mvm, bool force_disable)
{
struct iwl_device_power_cmd cmd = {
--
1.7.9.5
next prev parent reply other threads:[~2014-02-03 20:59 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-03 20:56 pull request: iwlwifi-next 2014-02-03 Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 01/62] iwlwifi: mvm: implement AP/GO uAPSD support Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 02/62] iwlwifi: Add 8000 HW family support Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 03/62] iwlwifi: mvm: support NVM sections for family 8000 Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 04/62] iwlwifi: pcie: disable APMG configurations " Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 05/62] iwlwifi: pcie: change CSR reset in " Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 06/62] iwlwifi: pcie: Disable L0S exit timer for 8000 HW family Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 07/62] iwlwifi: pcie: fix secure section / dual cpu firmware loading Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 08/62] iwlwifi: pcie: make FH debugfs file code easier to understand Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 09/62] iwlwifi: 7000: warn about old firmware Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 10/62] iwlwifi: remove obsolete TODO Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 11/62] iwlwifi: mvm: provide helper to fetch the iwl_mvm_sta from sta_id Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 12/62] iwlwifi: mvm: check ARRAY_SIZE(mvm->fw_id_to_mac_id) = IWL_MVM_STATION_COUNT Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 13/62] iwlwifi: pcie: fix unused variable gcc warning Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 14/62] iwlwifi: mvm: don't stop sched scan in restart Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 15/62] iwlwifi: mvm: notify scan completed even if no fw_restart Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 16/62] iwlwifi: mvm: add low-latency framework Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 17/62] iwlwifi: mvm: disable powersave in low-latency Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 18/62] iwlwifi: mvm: reserve bandwidth for low-latency interface Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 19/62] iwlwifi: mvm: limit non-low-latency binding scheduling duration Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 20/62] iwlwifi: mvm: BT Coex - set low latency vif as primary Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 21/62] iwlwifi: mvm: BT Coex - change SMPS settings in AP mode Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 22/62] iwlwifi: mvm: change the format of the SRAM dump Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 23/62] iwlwifi: mvm: add basic bcast filtering implementation Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 24/62] iwlwifi: mvm: add predefined broadcast filter configuration Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 25/62] iwlwifi: mvm: add dest ip to bcast " Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 26/62] iwlwifi: mvm: add bcast_filtering debugfs entries Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 27/62] iwlwifi: mvm: allow to force reduced tx power from debugfs Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 28/62] iwlwifi: rs: use const u16 for throughput tables Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 29/62] iwlwifi: mvm: add vif type in debugfs output Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 30/62] iwlwifi: mvm: add the quota remainder to a data binding Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 31/62] iwlwifi: mvm: fix quota allocation Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 32/62] iwlwifi: pcie: retrieve and parse ACPI power limitations Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 33/62] iwlwifi: mvm: handle platform PCIe power limitation Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 34/62] iwlwifi: 7265: add power limit/tx backoff translation table Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 35/62] iwlwifi: add D0i3 references boiler plate Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 36/62] iwlwifi: add enter/exit D0i3 ops Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 37/62] iwlwifi: add very first D0i3 support Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 38/62] iwlwifi: mvm: add D0i3 power configurations Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 39/62] iwlwifi: mvm: configure vifs upon D0i3 entry/exit Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 40/62] iwlwifi: mvm: allow transport sleep when FW is operational Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 41/62] iwlwifi: mvm: add D0i3 ref/unref for scan Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 42/62] iwlwifi: mvm: add D0i3 ref/unref for ROC commands Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 43/62] iwlwifi: mvm: add D0i3 ref/unref when ap, ibss or p2p_cli vifs are running Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 44/62] iwlwifi: mvm: add d0i3_refs debugfs file Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 45/62] iwlwifi: mvm: configure WOWLAN_CONFIGURATION on D0i3 entry Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 46/62] iwlwifi: mvm: get status on D0i3 exit Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 47/62] iwlwifi: mvm: add debugfs hook to take an mvm ref Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 48/62] iwlwifi: mvm: remove unneeded calculations Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 49/62] iwlwifi: mvm: support multiple firmware sections Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 50/62] iwlwifi: fix potential buffer overrun in fw name Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 51/62] iwlwifi: mvm: abort scheduled scan on scan request Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 52/62] iwlwifi: fix kerneldoc format Emmanuel Grumbach
2014-02-03 20:57 ` [PATCH 53/62] iwlwifi: mvm: BT Coex - fix SYNC2SCO flags Emmanuel Grumbach
2014-02-03 20:58 ` [PATCH 54/62] iwlwifi: mvm: clean up iwl_mvm_bss_info_changed_ap_ibss Emmanuel Grumbach
2014-02-03 20:58 ` [PATCH 55/62] iwlwifi: mvm: remove duplicate assignment to ap_ibss_active Emmanuel Grumbach
2014-02-03 20:58 ` [PATCH 56/62] iwlwifi: mvm: clean up in power code Emmanuel Grumbach
2014-02-03 20:58 ` [PATCH 57/62] iwlwifi: mvm: don't look at power commmand to decide if power is enabled Emmanuel Grumbach
2014-02-03 20:58 ` [PATCH 58/62] iwlwifi: mvm: don't send the beacon filtering command from iterator Emmanuel Grumbach
2014-02-03 20:58 ` [PATCH 59/62] iwlwifi: mvm: store latest power command for debugfs read Emmanuel Grumbach
2014-02-03 20:58 ` [PATCH 60/62] iwlwifi: mvm: remove support for legacy power API Emmanuel Grumbach
2014-02-03 20:58 ` Emmanuel Grumbach [this message]
2014-02-03 20:58 ` [PATCH 62/62] iwlwifi: mvm: refactor power code Emmanuel Grumbach
2014-02-12 20:27 ` pull request: iwlwifi-next 2014-02-03 John W. Linville
2014-02-13 7:10 ` [Ilw] " Grumbach, Emmanuel
2014-02-13 14:44 ` John W. Linville
2014-02-13 14:48 ` Grumbach, Emmanuel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1391461088-8082-61-git-send-email-egrumbach@gmail.com \
--to=egrumbach@gmail.com \
--cc=emmanuel.grumbach@intel.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).