update to stable rc 2.6.38.5-rc1
This commit is contained in:
parent
da9a09fb91
commit
19b3eb0b8a
|
@ -1,91 +0,0 @@
|
|||
From lenb@kernel.org Wed Mar 23 03:07:45 2011
|
||||
From: Len Brown <lenb@kernel.org>
|
||||
To: linux-acpi@vger.kernel.org
|
||||
Cc: Kyle McMartin <kyle@redhat.com>, Len Brown <len.brown@intel.com>
|
||||
Subject: [PATCH 35/42] ACPI battery: fribble sysfs files from a resume notifier
|
||||
Date: Wed, 23 Mar 2011 02:42:48 -0400
|
||||
|
||||
From: Kyle McMartin <kyle@redhat.com>
|
||||
|
||||
Upstream commit 25be5821521640eb00b7eb219ffe59664510d073
|
||||
|
||||
Commit da8aeb92 re-poked the battery on resume, but Linus reports that
|
||||
it broke his eee and partially reverted it in b23fffd7. Unfortunately
|
||||
this also results in my x201s giving crack values until the sysfs files
|
||||
are poked again. In the revert message, it was suggested that we poke it
|
||||
from a PM notifier, so let's do that.
|
||||
|
||||
With this in place, I haven't noticed the units going nutty on my
|
||||
gnome-power-manager across a dozen suspends or so...
|
||||
|
||||
Signed-off-by: Kyle McMartin <kyle@redhat.com>
|
||||
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
|
||||
Signed-off-by: Len Brown <len.brown@intel.com>
|
||||
---
|
||||
drivers/acpi/battery.c | 22 ++++++++++++++++++++++
|
||||
1 files changed, 22 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
|
||||
index ac1a599..fcc13ac 100644
|
||||
--- a/drivers/acpi/battery.c
|
||||
+++ b/drivers/acpi/battery.c
|
||||
@@ -33,6 +33,7 @@
|
||||
#include <linux/async.h>
|
||||
#include <linux/dmi.h>
|
||||
#include <linux/slab.h>
|
||||
+#include <linux/suspend.h>
|
||||
|
||||
#ifdef CONFIG_ACPI_PROCFS_POWER
|
||||
#include <linux/proc_fs.h>
|
||||
@@ -102,6 +103,7 @@ struct acpi_battery {
|
||||
struct mutex lock;
|
||||
struct power_supply bat;
|
||||
struct acpi_device *device;
|
||||
+ struct notifier_block pm_nb;
|
||||
unsigned long update_time;
|
||||
int rate_now;
|
||||
int capacity_now;
|
||||
@@ -940,6 +942,21 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event)
|
||||
power_supply_changed(&battery->bat);
|
||||
}
|
||||
|
||||
+static int battery_notify(struct notifier_block *nb,
|
||||
+ unsigned long mode, void *_unused)
|
||||
+{
|
||||
+ struct acpi_battery *battery = container_of(nb, struct acpi_battery,
|
||||
+ pm_nb);
|
||||
+ switch (mode) {
|
||||
+ case PM_POST_SUSPEND:
|
||||
+ sysfs_remove_battery(battery);
|
||||
+ sysfs_add_battery(battery);
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
static int acpi_battery_add(struct acpi_device *device)
|
||||
{
|
||||
int result = 0;
|
||||
@@ -972,6 +989,10 @@ static int acpi_battery_add(struct acpi_device *device)
|
||||
#endif
|
||||
kfree(battery);
|
||||
}
|
||||
+
|
||||
+ battery->pm_nb.notifier_call = battery_notify;
|
||||
+ register_pm_notifier(&battery->pm_nb);
|
||||
+
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -982,6 +1003,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type)
|
||||
if (!device || !acpi_driver_data(device))
|
||||
return -EINVAL;
|
||||
battery = acpi_driver_data(device);
|
||||
+ unregister_pm_notifier(&battery->pm_nb);
|
||||
#ifdef CONFIG_ACPI_PROCFS_POWER
|
||||
acpi_battery_remove_fs(device);
|
||||
#endif
|
||||
--
|
||||
1.7.4.1.343.ga91df
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
diff --git a/drivers/media/dvb/b2c2/flexcop-pci.c b/drivers/media/dvb/b2c2/flexcop-pci.c
|
||||
index 227c020..7465308 100644
|
||||
--- a/drivers/media/dvb/b2c2/flexcop-pci.c
|
||||
+++ b/drivers/media/dvb/b2c2/flexcop-pci.c
|
||||
@@ -39,6 +39,7 @@ MODULE_PARM_DESC(debug,
|
||||
|
||||
#define DRIVER_VERSION "0.1"
|
||||
#define DRIVER_NAME "Technisat/B2C2 FlexCop II/IIb/III Digital TV PCI Driver"
|
||||
+#define FLEXCOP_MODULE_NAME "b2c2-flexcop"
|
||||
#define DRIVER_AUTHOR "Patrick Boettcher <patrick.boettcher@desy.de>"
|
||||
|
||||
struct flexcop_pci {
|
||||
@@ -299,7 +300,7 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci)
|
||||
return ret;
|
||||
pci_set_master(fc_pci->pdev);
|
||||
|
||||
- if ((ret = pci_request_regions(fc_pci->pdev, DRIVER_NAME)) != 0)
|
||||
+ if ((ret = pci_request_regions(fc_pci->pdev, FLEXCOP_MODULE_NAME)) != 0)
|
||||
goto err_pci_disable_device;
|
||||
|
||||
fc_pci->io_mem = pci_iomap(fc_pci->pdev, 0, 0x800);
|
||||
@@ -313,7 +314,7 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci)
|
||||
pci_set_drvdata(fc_pci->pdev, fc_pci);
|
||||
spin_lock_init(&fc_pci->irq_lock);
|
||||
if ((ret = request_irq(fc_pci->pdev->irq, flexcop_pci_isr,
|
||||
- IRQF_SHARED, DRIVER_NAME, fc_pci)) != 0)
|
||||
+ IRQF_SHARED, FLEXCOP_MODULE_NAME, fc_pci)) != 0)
|
||||
goto err_pci_iounmap;
|
||||
|
||||
fc_pci->init_state |= FC_PCI_INIT;
|
|
@ -1,57 +0,0 @@
|
|||
From kernel-bounces@lists.fedoraproject.org Thu Apr 28 08:09:29 2011
|
||||
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
To: stable@kernel.org, kernel@lists.fedoraproject.org
|
||||
Subject: [PATCH 2.6.38 3/4] iwl3945: disable hw scan by default
|
||||
Date: Thu, 28 Apr 2011 14:08:14 +0200
|
||||
Message-Id: <1303992495-7337-4-git-send-email-sgruszka@redhat.com>
|
||||
|
||||
commit 0263aa45293838b514b8af674a03faf040991a90 upstream.
|
||||
|
||||
After new NetworkManager 0.8.996 changes, hardware scanning is causing
|
||||
microcode errors as reported here:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=683571
|
||||
and sometimes kernel crashes:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=688252
|
||||
|
||||
Also with hw scan there are very bad performance on some systems
|
||||
as reported here:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=671366
|
||||
|
||||
Since Intel no longer supports 3945, there is no chance to get proper
|
||||
firmware fixes, we need workaround problems by disable hardware scanning
|
||||
by default.
|
||||
|
||||
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
---
|
||||
drivers/net/wireless/iwlwifi/iwl3945-base.c | 3 ++-
|
||||
1 files changed, 2 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
index cf0699a..a8340f7 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
@@ -94,6 +94,7 @@ MODULE_LICENSE("GPL");
|
||||
struct iwl_mod_params iwl3945_mod_params = {
|
||||
.sw_crypto = 1,
|
||||
.restart_fw = 1,
|
||||
+ .disable_hw_scan = 1,
|
||||
/* the rest are 0 by default */
|
||||
};
|
||||
|
||||
@@ -4317,7 +4318,7 @@ MODULE_PARM_DESC(debug, "debug output mask");
|
||||
#endif
|
||||
module_param_named(disable_hw_scan, iwl3945_mod_params.disable_hw_scan,
|
||||
int, S_IRUGO);
|
||||
-MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)");
|
||||
+MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 1)");
|
||||
module_param_named(fw_restart3945, iwl3945_mod_params.restart_fw, int, S_IRUGO);
|
||||
MODULE_PARM_DESC(fw_restart3945, "restart firmware in case of error");
|
||||
|
||||
--
|
||||
1.7.1
|
||||
|
||||
_______________________________________________
|
||||
kernel mailing list
|
||||
kernel@lists.fedoraproject.org
|
||||
https://admin.fedoraproject.org/mailman/listinfo/kernel
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
From kernel-bounces@lists.fedoraproject.org Thu Apr 28 08:09:23 2011
|
||||
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
To: stable@kernel.org, kernel@lists.fedoraproject.org
|
||||
Subject: [PATCH 2.6.38 2/4] iwl3945: do not deprecate software scan
|
||||
Date: Thu, 28 Apr 2011 14:08:13 +0200
|
||||
Message-Id: <1303992495-7337-3-git-send-email-sgruszka@redhat.com>
|
||||
|
||||
commit 3bda50e3eaf58a4b9c4ce34204e5faa15c8b1b97 upstream.
|
||||
|
||||
Software scanning can be used for workaround some performance problems,
|
||||
so do not deprecate it.
|
||||
|
||||
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
---
|
||||
drivers/net/wireless/iwlwifi/iwl3945-base.c | 6 ++----
|
||||
1 files changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
index 371abbf..cf0699a 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
@@ -3995,8 +3995,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
|
||||
* "the hard way", rather than using device's scan.
|
||||
*/
|
||||
if (iwl3945_mod_params.disable_hw_scan) {
|
||||
- dev_printk(KERN_DEBUG, &(pdev->dev),
|
||||
- "sw scan support is deprecated\n");
|
||||
+ IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
|
||||
iwl3945_hw_ops.hw_scan = NULL;
|
||||
}
|
||||
|
||||
@@ -4318,8 +4317,7 @@ MODULE_PARM_DESC(debug, "debug output mask");
|
||||
#endif
|
||||
module_param_named(disable_hw_scan, iwl3945_mod_params.disable_hw_scan,
|
||||
int, S_IRUGO);
|
||||
-MODULE_PARM_DESC(disable_hw_scan,
|
||||
- "disable hardware scanning (default 0) (deprecated)");
|
||||
+MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)");
|
||||
module_param_named(fw_restart3945, iwl3945_mod_params.restart_fw, int, S_IRUGO);
|
||||
MODULE_PARM_DESC(fw_restart3945, "restart firmware in case of error");
|
||||
|
||||
--
|
||||
1.7.1
|
||||
|
||||
_______________________________________________
|
||||
kernel mailing list
|
||||
kernel@lists.fedoraproject.org
|
||||
https://admin.fedoraproject.org/mailman/listinfo/kernel
|
||||
|
|
@ -1,107 +0,0 @@
|
|||
From kernel-bounces@lists.fedoraproject.org Thu Apr 28 08:09:22 2011
|
||||
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
To: stable@kernel.org, kernel@lists.fedoraproject.org
|
||||
Subject: [PATCH 2.6.38 1/4] iwlwifi: do not set tx power when channel is
|
||||
changing
|
||||
Date: Thu, 28 Apr 2011 14:08:12 +0200
|
||||
Message-Id: <1303992495-7337-2-git-send-email-sgruszka@redhat.com>
|
||||
|
||||
commit f844a709a7d8f8be61a571afc31dfaca9e779621 upstream.
|
||||
|
||||
Mac80211 can request for tx power and channel change in one ->config
|
||||
call. If that happens, *_send_tx_power functions will try to setup tx
|
||||
power for old channel, what can be not correct because we already change
|
||||
the band. I.e error "Failed to get channel info for channel 140 [0]",
|
||||
can be printed frequently when operating in software scanning mode.
|
||||
|
||||
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
---
|
||||
drivers/net/wireless/iwlwifi/iwl-3945.c | 2 +-
|
||||
drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +-
|
||||
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 5 ++---
|
||||
drivers/net/wireless/iwlwifi/iwl-core.c | 13 ++++++++++---
|
||||
4 files changed, 14 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
|
||||
index 39b6f16..4e7b58b 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
|
||||
@@ -1823,7 +1823,7 @@ int iwl3945_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
|
||||
|
||||
/* If we issue a new RXON command which required a tune then we must
|
||||
* send a new TXPOWER command or we won't be able to Tx any frames */
|
||||
- rc = priv->cfg->ops->lib->send_tx_power(priv);
|
||||
+ rc = iwl_set_tx_power(priv, priv->tx_power_next, true);
|
||||
if (rc) {
|
||||
IWL_ERR(priv, "Error setting Tx power (%d).\n", rc);
|
||||
return rc;
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
|
||||
index 91a9f52..992caa0 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
|
||||
@@ -1571,7 +1571,7 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *c
|
||||
|
||||
/* If we issue a new RXON command which required a tune then we must
|
||||
* send a new TXPOWER command or we won't be able to Tx any frames */
|
||||
- ret = iwl_set_tx_power(priv, priv->tx_power_user_lmt, true);
|
||||
+ ret = iwl_set_tx_power(priv, priv->tx_power_next, true);
|
||||
if (ret) {
|
||||
IWL_ERR(priv, "Error sending TX power (%d)\n", ret);
|
||||
return ret;
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
|
||||
index 6d140bd..ee802fe 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
|
||||
@@ -288,10 +288,9 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
|
||||
* If we issue a new RXON command which required a tune then we must
|
||||
* send a new TXPOWER command or we won't be able to Tx any frames.
|
||||
*
|
||||
- * FIXME: which RXON requires a tune? Can we optimise this out in
|
||||
- * some cases?
|
||||
+ * It's expected we set power here if channel is changing.
|
||||
*/
|
||||
- ret = iwl_set_tx_power(priv, priv->tx_power_user_lmt, true);
|
||||
+ ret = iwl_set_tx_power(priv, priv->tx_power_next, true);
|
||||
if (ret) {
|
||||
IWL_ERR(priv, "Error sending TX power (%d)\n", ret);
|
||||
return ret;
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
|
||||
index efbde1f..91cac6f 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
|
||||
@@ -1161,6 +1161,8 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)
|
||||
{
|
||||
int ret;
|
||||
s8 prev_tx_power;
|
||||
+ bool defer;
|
||||
+ struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
|
||||
|
||||
lockdep_assert_held(&priv->mutex);
|
||||
|
||||
@@ -1188,10 +1190,15 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)
|
||||
if (!iwl_is_ready_rf(priv))
|
||||
return -EIO;
|
||||
|
||||
- /* scan complete use tx_power_next, need to be updated */
|
||||
+ /* scan complete and commit_rxon use tx_power_next value,
|
||||
+ * it always need to be updated for newest request */
|
||||
priv->tx_power_next = tx_power;
|
||||
- if (test_bit(STATUS_SCANNING, &priv->status) && !force) {
|
||||
- IWL_DEBUG_INFO(priv, "Deferring tx power set while scanning\n");
|
||||
+
|
||||
+ /* do not set tx power when scanning or channel changing */
|
||||
+ defer = test_bit(STATUS_SCANNING, &priv->status) ||
|
||||
+ memcmp(&ctx->active, &ctx->staging, sizeof(ctx->staging));
|
||||
+ if (defer && !force) {
|
||||
+ IWL_DEBUG_INFO(priv, "Deferring tx power set\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
--
|
||||
1.7.1
|
||||
|
||||
_______________________________________________
|
||||
kernel mailing list
|
||||
kernel@lists.fedoraproject.org
|
||||
https://admin.fedoraproject.org/mailman/listinfo/kernel
|
||||
|
|
@ -1,134 +0,0 @@
|
|||
From kernel-bounces@lists.fedoraproject.org Thu Apr 28 08:09:35 2011
|
||||
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
To: stable@kernel.org, kernel@lists.fedoraproject.org
|
||||
Subject: [PATCH 2.6.38 4/4] iwlwifi: fix tx_power initialization
|
||||
Date: Thu, 28 Apr 2011 14:08:15 +0200
|
||||
Message-Id: <1303992495-7337-5-git-send-email-sgruszka@redhat.com>
|
||||
|
||||
commit 332704a51498a7e29aa92c19dc03f11f80b71bfe upstream.
|
||||
|
||||
priv->tx_power_next is not initialized to max supported power,
|
||||
but instead default value is used, what cause errors like
|
||||
|
||||
[ 58.597834] iwl3945 0000:03:00.0: Requested user TXPOWER 15 above upper limit 14.
|
||||
[ 58.597839] iwl3945 0000:03:00.0: Error setting Tx power (-22).
|
||||
|
||||
if maximum tx power read from the eeprom is smaller than default.
|
||||
In consequence card is unable to initialize properly. Fix the problem
|
||||
and cleanup tx power initialization.
|
||||
|
||||
Reported-and-tested-by: Robin Dong <hao.bigrat@gmail.com>
|
||||
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
||||
---
|
||||
drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 2 --
|
||||
drivers/net/wireless/iwlwifi/iwl-agn.c | 6 ------
|
||||
drivers/net/wireless/iwlwifi/iwl-core.c | 9 +++++++--
|
||||
drivers/net/wireless/iwlwifi/iwl-eeprom.c | 7 -------
|
||||
drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 ----
|
||||
5 files changed, 7 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
|
||||
index 65b5834..c2dd4cd 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-hw.h
|
||||
@@ -74,8 +74,6 @@
|
||||
/* RSSI to dBm */
|
||||
#define IWL39_RSSI_OFFSET 95
|
||||
|
||||
-#define IWL_DEFAULT_TX_POWER 0x0F
|
||||
-
|
||||
/*
|
||||
* EEPROM related constants, enums, and structures.
|
||||
*/
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
|
||||
index c1cfd99..35239f0 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
|
||||
@@ -3841,12 +3841,6 @@ static int iwl_init_drv(struct iwl_priv *priv)
|
||||
priv->dynamic_frag_thresh = BT_FRAG_THRESHOLD_DEF;
|
||||
}
|
||||
|
||||
- /* Set the tx_power_user_lmt to the lowest power level
|
||||
- * this value will get overwritten by channel max power avg
|
||||
- * from eeprom */
|
||||
- priv->tx_power_user_lmt = IWLAGN_TX_POWER_TARGET_POWER_MIN;
|
||||
- priv->tx_power_next = IWLAGN_TX_POWER_TARGET_POWER_MIN;
|
||||
-
|
||||
ret = iwl_init_channel_map(priv);
|
||||
if (ret) {
|
||||
IWL_ERR(priv, "initializing regulatory failed: %d\n", ret);
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
|
||||
index 91cac6f..294e9fc 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
|
||||
@@ -168,6 +168,7 @@ int iwlcore_init_geos(struct iwl_priv *priv)
|
||||
struct ieee80211_channel *geo_ch;
|
||||
struct ieee80211_rate *rates;
|
||||
int i = 0;
|
||||
+ s8 max_tx_power = 0;
|
||||
|
||||
if (priv->bands[IEEE80211_BAND_2GHZ].n_bitrates ||
|
||||
priv->bands[IEEE80211_BAND_5GHZ].n_bitrates) {
|
||||
@@ -244,8 +245,8 @@ int iwlcore_init_geos(struct iwl_priv *priv)
|
||||
|
||||
geo_ch->flags |= ch->ht40_extension_channel;
|
||||
|
||||
- if (ch->max_power_avg > priv->tx_power_device_lmt)
|
||||
- priv->tx_power_device_lmt = ch->max_power_avg;
|
||||
+ if (ch->max_power_avg > max_tx_power)
|
||||
+ max_tx_power = ch->max_power_avg;
|
||||
} else {
|
||||
geo_ch->flags |= IEEE80211_CHAN_DISABLED;
|
||||
}
|
||||
@@ -258,6 +259,10 @@ int iwlcore_init_geos(struct iwl_priv *priv)
|
||||
geo_ch->flags);
|
||||
}
|
||||
|
||||
+ priv->tx_power_device_lmt = max_tx_power;
|
||||
+ priv->tx_power_user_lmt = max_tx_power;
|
||||
+ priv->tx_power_next = max_tx_power;
|
||||
+
|
||||
if ((priv->bands[IEEE80211_BAND_5GHZ].n_channels == 0) &&
|
||||
priv->cfg->sku & IWL_SKU_A) {
|
||||
IWL_INFO(priv, "Incorrectly detected BG card as ABG. "
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
|
||||
index 358cfd7..8b3c127 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
|
||||
@@ -724,13 +724,6 @@ int iwl_init_channel_map(struct iwl_priv *priv)
|
||||
flags & EEPROM_CHANNEL_RADAR))
|
||||
? "" : "not ");
|
||||
|
||||
- /* Set the tx_power_user_lmt to the highest power
|
||||
- * supported by any channel */
|
||||
- if (eeprom_ch_info[ch].max_power_avg >
|
||||
- priv->tx_power_user_lmt)
|
||||
- priv->tx_power_user_lmt =
|
||||
- eeprom_ch_info[ch].max_power_avg;
|
||||
-
|
||||
ch_info++;
|
||||
}
|
||||
}
|
||||
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
index a8340f7..64917ed 100644
|
||||
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
|
||||
@@ -3859,10 +3859,6 @@ static int iwl3945_init_drv(struct iwl_priv *priv)
|
||||
priv->force_reset[IWL_FW_RESET].reset_duration =
|
||||
IWL_DELAY_NEXT_FORCE_FW_RELOAD;
|
||||
|
||||
-
|
||||
- priv->tx_power_user_lmt = IWL_DEFAULT_TX_POWER;
|
||||
- priv->tx_power_next = IWL_DEFAULT_TX_POWER;
|
||||
-
|
||||
if (eeprom->version < EEPROM_3945_EEPROM_VERSION) {
|
||||
IWL_WARN(priv, "Unsupported EEPROM version: 0x%04X\n",
|
||||
eeprom->version);
|
||||
--
|
||||
1.7.1
|
||||
|
||||
_______________________________________________
|
||||
kernel mailing list
|
||||
kernel@lists.fedoraproject.org
|
||||
https://admin.fedoraproject.org/mailman/listinfo/kernel
|
||||
|
28
kernel.spec
28
kernel.spec
|
@ -51,7 +51,7 @@ Summary: The Linux kernel
|
|||
# For non-released -rc kernels, this will be prepended with "0.", so
|
||||
# for example a 3 here will become 0.3
|
||||
#
|
||||
%global baserelease 20
|
||||
%global baserelease 21
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
@ -63,9 +63,9 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 4
|
||||
%define stable_update 5
|
||||
# Is it a -stable RC?
|
||||
%define stable_rc 0
|
||||
%define stable_rc 1
|
||||
# Set rpm version accordingly
|
||||
%if 0%{?stable_update}
|
||||
%define stablerev .%{stable_update}
|
||||
|
@ -644,8 +644,6 @@ Patch391: linux-2.6-acpi-video-dos.patch
|
|||
Patch393: acpi-ec-add-delay-before-write.patch
|
||||
Patch394: linux-2.6-acpi-debug-infinite-loop.patch
|
||||
|
||||
Patch399: acpi_battery-fribble-sysfs-files-from-a-resume-notifier.patch
|
||||
|
||||
Patch450: linux-2.6-input-kill-stupid-messages.patch
|
||||
Patch452: linux-2.6.30-no-pcspkr-modalias.patch
|
||||
|
||||
|
@ -700,8 +698,6 @@ Patch2899: linux-2.6-v4l-dvb-fixes.patch
|
|||
Patch2900: linux-2.6-v4l-dvb-update.patch
|
||||
Patch2901: linux-2.6-v4l-dvb-experimental.patch
|
||||
|
||||
Patch2918: flexcop-fix-xlate_proc_name-warning.patch
|
||||
|
||||
# fs fixes
|
||||
|
||||
# NFSv4
|
||||
|
@ -727,11 +723,6 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch
|
|||
Patch12305: printk-do-not-mangle-valid-userspace-syslog-prefixes.patch
|
||||
Patch12306: scsi-sd-downgrade-caching-printk-from-error-to-notice.patch
|
||||
|
||||
Patch12310: iwlwifi-do-not-set-tx-power-when-channel-is-changing.patch
|
||||
Patch12311: iwl3945-do-not-deprecate-software-scan.patch
|
||||
Patch12312: iwl3945-disable-hw-scan-by-default.patch
|
||||
Patch12313: iwlwifi-fix-tx_power-initialization.patch
|
||||
|
||||
#netconsole fixes
|
||||
Patch12400: linux-2.6-netconsole-deadlock.patch
|
||||
|
||||
|
@ -1226,7 +1217,6 @@ ApplyPatch linux-2.6-defaults-acpi-video.patch
|
|||
ApplyPatch linux-2.6-acpi-video-dos.patch
|
||||
ApplyPatch acpi-ec-add-delay-before-write.patch
|
||||
ApplyPatch linux-2.6-acpi-debug-infinite-loop.patch
|
||||
ApplyPatch acpi_battery-fribble-sysfs-files-from-a-resume-notifier.patch
|
||||
|
||||
# Various low-impact patches to aid debugging.
|
||||
ApplyPatch linux-2.6-debug-sizeof-structs.patch
|
||||
|
@ -1259,12 +1249,6 @@ ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch
|
|||
|
||||
# Networking
|
||||
|
||||
# rhbz#688252
|
||||
ApplyPatch iwlwifi-do-not-set-tx-power-when-channel-is-changing.patch
|
||||
ApplyPatch iwl3945-do-not-deprecate-software-scan.patch
|
||||
ApplyPatch iwl3945-disable-hw-scan-by-default.patch
|
||||
ApplyPatch iwlwifi-fix-tx_power-initialization.patch
|
||||
|
||||
# Misc fixes
|
||||
# The input layer spews crap no-one cares about.
|
||||
ApplyPatch linux-2.6-input-kill-stupid-messages.patch
|
||||
|
@ -1332,9 +1316,6 @@ ApplyOptionalPatch linux-2.6-v4l-dvb-fixes.patch
|
|||
ApplyOptionalPatch linux-2.6-v4l-dvb-update.patch
|
||||
ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch
|
||||
|
||||
# rhbz#664852
|
||||
ApplyPatch flexcop-fix-xlate_proc_name-warning.patch
|
||||
|
||||
# Patches headed upstream
|
||||
|
||||
ApplyPatch disable-i8042-check-on-apple-mac.patch
|
||||
|
@ -1972,6 +1953,9 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Sun May 01 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38.5-21.rc1
|
||||
- Update to stable release candidate 2.6.38.5-rc1
|
||||
|
||||
* Thu Apr 28 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.38.4-20
|
||||
- [sgruszka@] Upstream fixes for iwl3945 bugs (#683571, #688252, #671366)
|
||||
|
||||
|
|
Loading…
Reference in New Issue