rpms/kernel/devel linux-2.6-iwlwifi-preferred_rate_control.patch, NONE, 1.1 kernel-2.6.spec, 1.3156, 1.3157
John W. Linville (linville)
fedora-extras-commits at redhat.com
Tue May 15 18:15:06 UTC 2007
Author: linville
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12567
Modified Files:
kernel-2.6.spec
Added Files:
linux-2.6-iwlwifi-preferred_rate_control.patch
Log Message:
make sure iwl3945 gets correct rate control algorithm
linux-2.6-iwlwifi-preferred_rate_control.patch:
--- NEW FILE linux-2.6-iwlwifi-preferred_rate_control.patch ---
--- linux-2.6.21.noarch/include/net/mac80211.h.orig 2007-05-15 11:07:56.000000000 -0400
+++ linux-2.6.21.noarch/include/net/mac80211.h 2007-05-15 13:38:51.000000000 -0400
@@ -533,6 +533,10 @@ struct ieee80211_hw {
/* Number of available hardware TX queues for data packets.
* WMM requires at least four queues. */
int queues;
+
+ /* Preferred rate control algorithm. Leave as NULL for stack
+ * to select algorithm */
+ char *preferred_rate_control;
};
static inline void SET_IEEE80211_DEV(struct ieee80211_hw *hw, struct device *dev)
--- linux-2.6.21.noarch/net/mac80211/ieee80211.c.orig 2007-05-15 11:07:57.000000000 -0400
+++ linux-2.6.21.noarch/net/mac80211/ieee80211.c 2007-05-15 13:38:51.000000000 -0400
@@ -4869,10 +4869,14 @@ int ieee80211_register_hw(struct ieee802
ieee80211_debugfs_add_netdev(IEEE80211_DEV_TO_SUB_IF(local->mdev));
- result = ieee80211_init_rate_ctrl_alg(local, NULL);
+ result = ieee80211_init_rate_ctrl_alg(local,
+ hw->preferred_rate_control);
+
if (result < 0) {
- printk(KERN_DEBUG "%s: Failed to initialize rate control "
- "algorithm\n", local->mdev->name);
+ printk(KERN_DEBUG "%s: Failed to initialize %s rate control "
+ "algorithm\n", local->mdev->name,
+ hw->preferred_rate_control ?
+ hw->preferred_rate_control : "default");
goto fail_rate;
}
--- linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c.orig 2007-05-15 13:55:57.000000000 -0400
+++ linux-2.6.21.noarch/drivers/net/wireless/mac80211/iwlwifi/base.c 2007-05-15 13:43:29.000000000 -0400
@@ -9996,6 +9996,7 @@ static void ipw_bg_alive_start(struct wo
mutex_unlock(&priv->mutex);
ieee80211_rate_control_register(&priv->rate_control);
+ priv->ieee->preferred_rate_control = "iwl-3945-rs";
rc = ieee80211_register_hw(priv->ieee);
if (rc) {
IPW_ERROR("Failed to register network "
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3156
retrieving revision 1.3157
diff -u -r1.3156 -r1.3157
--- kernel-2.6.spec 15 May 2007 14:34:30 -0000 1.3156
+++ kernel-2.6.spec 15 May 2007 18:14:31 -0000 1.3157
@@ -602,6 +602,7 @@
Patch2301: git-wireless-dev.patch
Patch2302: git-iwlwifi.patch
Patch2303: linux-2.6-bcm43xx-pci-neuter.patch
+Patch2304: linux-2.6-iwlwifi-preferred_rate_control.patch
# Assorted dyntick/clock/timer fixes.
Patch2400: linux-2.6-highres-dyntick-avoid-xtime-lock-contention.patch
@@ -1351,6 +1352,8 @@
%patch2302 -p1
# ...and avoid bcm43xx vs bcm43xx-mac80211 PCI ID conflicts
%patch2303 -p1
+# ...and let iwl3945 specify its preferred rate control algorithm
+%patch2304 -p1
# Assorted dyntick/clock/timer fixes.
%patch2400 -p1
@@ -2333,6 +2336,9 @@
%endif
%changelog
+* Tue May 15 2007 John W. Linville <linville at redhat.com>
+- Let iwl3945 pick preferred rate control alg (or face the consequences)
+
* Tue May 15 2007 Dave Jones <davej at redhat.com>
- NFS: Added support to turn off the NFSv3 READDIRPLUS RPC
More information about the fedora-extras-commits
mailing list