diff for duplicates of <200711170006.49654.mboton.lkml@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 0d8bcf3..3e4e8fa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,92 +1,80 @@ -This patch adds power management support in iwl3945 and iwl4965 drivers= -=2E +This patch adds power management support in iwl3945 and iwl4965 drivers. -Signed-off-by: Miguel Bot=C3=B3n <mboton@gmail.com> +Signed-off-by: Miguel Botón <mboton@gmail.com> -diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/= -wireless/iwlwifi/iwl3945-base.c +diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 9baf8de..5c7b422 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c -@@ -6951,6 +7187,7 @@ static int iwl3945_mac_config(struct ieee80211_hw= - *hw, struct ieee80211_conf *co - struct iwl3945_priv *priv =3D hw->priv; +@@ -6951,6 +7187,7 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co + struct iwl3945_priv *priv = hw->priv; const struct iwl3945_channel_info *ch_info; unsigned long flags; + int power_mode; -=20 + mutex_lock(&priv->mutex); IWL_DEBUG_MAC80211("enter to channel %d\n", conf->channel); -@@ -7001,6 +7238,23 @@ static int iwl3945_mac_config(struct ieee80211_h= -w *hw, struct ieee80211_conf *co +@@ -7001,6 +7238,23 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co } #endif -=20 + + if (conf->power_management_enable) -+ power_mode =3D IWL_POWER_BATTERY | IWL_POWER_ENABLED; ++ power_mode = IWL_POWER_BATTERY | IWL_POWER_ENABLED; + else -+ power_mode =3D IWL_POWER_AC; ++ power_mode = IWL_POWER_AC; + -+ if (priv->power_mode !=3D power_mode) { ++ if (priv->power_mode != power_mode) { + int rc; + -+ rc =3D iwl3945_send_power_mode(priv, power_mode); ++ rc = iwl3945_send_power_mode(priv, power_mode); + if (rc) { + IWL_DEBUG_MAC80211("failed setting power mode.\n"); + mutex_unlock(&priv->mutex); + return -EINVAL; + } -+ priv->power_mode =3D power_mode; ++ priv->power_mode = power_mode; + } + iwl3945_radio_kill_sw(priv, !conf->radio_enabled); -=20 + if (!conf->radio_enabled) { -diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/= -wireless/iwlwifi/iwl4965-base.c +diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index df011ea..8d303c5 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c -@@ -7352,6 +7352,7 @@ static int iwl4965_mac_config(struct ieee80211_hw= - *hw, struct ieee80211_conf *co - struct iwl4965_priv *priv =3D hw->priv; +@@ -7352,6 +7352,7 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co + struct iwl4965_priv *priv = hw->priv; const struct iwl4965_channel_info *ch_info; unsigned long flags; + int power_mode; -=20 + mutex_lock(&priv->mutex); IWL_DEBUG_MAC80211("enter to channel %d\n", conf->channel); -@@ -7414,6 +7415,23 @@ static int iwl4965_mac_config(struct ieee80211_h= -w *hw, struct ieee80211_conf *co +@@ -7414,6 +7415,23 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co } #endif -=20 + + if (conf->power_management_enable) -+ power_mode =3D IWL_POWER_BATTERY | IWL_POWER_ENABLED; ++ power_mode = IWL_POWER_BATTERY | IWL_POWER_ENABLED; + else -+ power_mode =3D IWL_POWER_AC; ++ power_mode = IWL_POWER_AC; + -+ if (priv->power_mode !=3D power_mode) { ++ if (priv->power_mode != power_mode) { + int rc; + -+ rc =3D iwl4965_send_power_mode(priv, power_mode); ++ rc = iwl4965_send_power_mode(priv, power_mode); + if (rc) { + IWL_DEBUG_MAC80211("failed setting power mode.\n"); + mutex_unlock(&priv->mutex); + return -EINVAL; + } -+ priv->power_mode =3D power_mode; ++ priv->power_mode = power_mode; + } + iwl4965_radio_kill_sw(priv, !conf->radio_enabled); -=20 + if (!conf->radio_enabled) { ---=20 - Miguel Bot=C3=B3n -- -To unsubscribe from this list: send the line "unsubscribe linux-wireles= -s" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html +-- + Miguel Botón diff --git a/a/content_digest b/N1/content_digest index 416bf88..1231771 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -7,97 +7,85 @@ " yi.zhu@intel.com\0" "\00:1\0" "b\0" - "This patch adds power management support in iwl3945 and iwl4965 drivers=\n" - "=2E\n" + "This patch adds power management support in iwl3945 and iwl4965 drivers.\n" "\n" - "Signed-off-by: Miguel Bot=C3=B3n <mboton@gmail.com>\n" + "Signed-off-by: Miguel Bot\303\263n <mboton@gmail.com>\n" "\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/=\n" - "wireless/iwlwifi/iwl3945-base.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c\n" "index 9baf8de..5c7b422 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c\n" - "@@ -6951,6 +7187,7 @@ static int iwl3945_mac_config(struct ieee80211_hw=\n" - " *hw, struct ieee80211_conf *co\n" - " \tstruct iwl3945_priv *priv =3D hw->priv;\n" + "@@ -6951,6 +7187,7 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co\n" + " \tstruct iwl3945_priv *priv = hw->priv;\n" " \tconst struct iwl3945_channel_info *ch_info;\n" " \tunsigned long flags;\n" "+\tint power_mode;\n" - "=20\n" + " \n" " \tmutex_lock(&priv->mutex);\n" " \tIWL_DEBUG_MAC80211(\"enter to channel %d\\n\", conf->channel);\n" - "@@ -7001,6 +7238,23 @@ static int iwl3945_mac_config(struct ieee80211_h=\n" - "w *hw, struct ieee80211_conf *co\n" + "@@ -7001,6 +7238,23 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co\n" " \t}\n" " #endif\n" - "=20\n" + " \n" "+\tif (conf->power_management_enable)\n" - "+\t\tpower_mode =3D IWL_POWER_BATTERY | IWL_POWER_ENABLED;\n" + "+\t\tpower_mode = IWL_POWER_BATTERY | IWL_POWER_ENABLED;\n" "+\telse\n" - "+\t\tpower_mode =3D IWL_POWER_AC;\n" + "+\t\tpower_mode = IWL_POWER_AC;\n" "+\n" - "+\tif (priv->power_mode !=3D power_mode) {\n" + "+\tif (priv->power_mode != power_mode) {\n" "+\t\tint rc;\n" "+\n" - "+\t\trc =3D iwl3945_send_power_mode(priv, power_mode);\n" + "+\t\trc = iwl3945_send_power_mode(priv, power_mode);\n" "+\t\tif (rc) {\n" "+\t\t\tIWL_DEBUG_MAC80211(\"failed setting power mode.\\n\");\n" "+\t\t\tmutex_unlock(&priv->mutex);\n" "+\t\t\treturn -EINVAL;\n" "+\t\t}\n" - "+\t\tpriv->power_mode =3D power_mode;\n" + "+\t\tpriv->power_mode = power_mode;\n" "+\t}\n" "+\n" " \tiwl3945_radio_kill_sw(priv, !conf->radio_enabled);\n" - "=20\n" + " \n" " \tif (!conf->radio_enabled) {\n" - "diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/=\n" - "wireless/iwlwifi/iwl4965-base.c\n" + "diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c\n" "index df011ea..8d303c5 100644\n" "--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c\n" "+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c\n" - "@@ -7352,6 +7352,7 @@ static int iwl4965_mac_config(struct ieee80211_hw=\n" - " *hw, struct ieee80211_conf *co\n" - " \tstruct iwl4965_priv *priv =3D hw->priv;\n" + "@@ -7352,6 +7352,7 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co\n" + " \tstruct iwl4965_priv *priv = hw->priv;\n" " \tconst struct iwl4965_channel_info *ch_info;\n" " \tunsigned long flags;\n" "+\tint power_mode;\n" - "=20\n" + " \n" " \tmutex_lock(&priv->mutex);\n" " \tIWL_DEBUG_MAC80211(\"enter to channel %d\\n\", conf->channel);\n" - "@@ -7414,6 +7415,23 @@ static int iwl4965_mac_config(struct ieee80211_h=\n" - "w *hw, struct ieee80211_conf *co\n" + "@@ -7414,6 +7415,23 @@ static int iwl4965_mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *co\n" " \t}\n" " #endif\n" - "=20\n" + " \n" "+\tif (conf->power_management_enable)\n" - "+\t\tpower_mode =3D IWL_POWER_BATTERY | IWL_POWER_ENABLED;\n" + "+\t\tpower_mode = IWL_POWER_BATTERY | IWL_POWER_ENABLED;\n" "+\telse\n" - "+\t\tpower_mode =3D IWL_POWER_AC;\n" + "+\t\tpower_mode = IWL_POWER_AC;\n" "+\n" - "+\tif (priv->power_mode !=3D power_mode) {\n" + "+\tif (priv->power_mode != power_mode) {\n" "+\t\tint rc;\n" "+\n" - "+\t\trc =3D iwl4965_send_power_mode(priv, power_mode);\n" + "+\t\trc = iwl4965_send_power_mode(priv, power_mode);\n" "+\t\tif (rc) {\n" "+\t\t\tIWL_DEBUG_MAC80211(\"failed setting power mode.\\n\");\n" "+\t\t\tmutex_unlock(&priv->mutex);\n" "+\t\t\treturn -EINVAL;\n" "+\t\t}\n" - "+\t\tpriv->power_mode =3D power_mode;\n" + "+\t\tpriv->power_mode = power_mode;\n" "+\t}\n" "+\n" " \tiwl4965_radio_kill_sw(priv, !conf->radio_enabled);\n" - "=20\n" + " \n" " \tif (!conf->radio_enabled) {\n" "\n" "\n" - "--=20\n" - "\tMiguel Bot=C3=B3n\n" - "-\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-wireles=\n" - "s\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + "-- \n" + "\tMiguel Bot\303\263n" -df8c42b170a41899ea1ce439e134906a78755fd089d234006515e8be5d28e306 +96e61b733e95c97d47f0193ad59d1639546e044fd60f5830b84f830c748790fd
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.