Please pull 'fixes-davem' branch of wireless-2.6 (for 2.6.23)
Subsystems (4)
Dave,
These are a few more minor fixes that I would like to have in 2.6.23 if at all possible.
Thanks!
John
---
Individual patches are available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/fixes-davem/
---
The following changes since commit 81cfe79b9c577139a873483654640eb3f6e78c39:
Linus Torvalds (1):
Linux 2.6.23-rc7
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git fixes-davem
Johannes Berg (3):
cfg80211: fix initialisation if built-in
net/mac80211/wme.c: fix sparse warning
mac80211: fix initialisation when built-in
Satyam Sharma (1):
net/wireless/sysfs.c: Shut up build warning
net/mac80211/ieee80211.c | 2 +- net/mac80211/rc80211_simple.c | 2 +- net/mac80211/wme.c | 2 +- net/wireless/core.c | 2 +- net/wireless/sysfs.c | 2 ++ 5 files changed, 6 insertions(+), 4 deletions(-)
net/mac80211/ieee80211.c +1 -1
@@ -5259,7 +5259,7 @@ static void __exit ieee80211_exit(void) } -module_init (ieee80211_init); +subsys_initcall (ieee80211_init);module_exit (ieee80211_exit);MODULE_DESCRIPTION ("IEEE 802.11 subsystem" );
net/mac80211/rc80211_simple.c +1 -1
@@ -431,7 +431,7 @@ static void __exit rate_control_simple_exit(void) } -module_init (rate_control_simple_init); +subsys_initcall (rate_control_simple_init);module_exit (rate_control_simple_exit);MODULE_DESCRIPTION ("Simple rate control algorithm for ieee80211" );
net/mac80211/wme.c +1 -1
@@ -424,7 +424,7 @@ static int wme_qdiscop_init(struct Qdisc *qd, struct rtattr *opt)skb_queue_head_init (&q->requeued[i]); q->queues[i] =qdisc_create_dflt (qd->dev, &pfifo_qdisc_ops, qd->handle); -if (q->queues[i] ==0 ) { +if (!q->queues[i]) { q->queues[i] = &noop_qdisc;printk (KERN_ERR "%s child qdisc %i creation failed" , dev->name, i); }
net/wireless/core.c +1 -1
@@ -213,7 +213,7 @@ out_fail_notifier: out_fail_sysfs:return err; } -module_init (cfg80211_init); +subsys_initcall (cfg80211_init);static void cfg80211_exit (void ) {
net/wireless/sysfs.c +2 -0
@@ -52,12 +52,14 @@ static void wiphy_dev_release(struct device *dev)cfg80211_dev_free (rdev); } +#ifdef CONFIG_HOTPLUG static int wiphy_uevent (struct device *dev,char **envp,int num_envp,char *buf,int size) {/* TODO, we probably need stuff here */ return 0 ; } +#endif struct class ieee80211_class = { .name ="ieee80211" ,
Signature · 2 lines
John W. Linville [email protected]
From: "John W. Linville" <[email protected]>
Date: Sat, 22 Sep 2007 11:41:42 -0400
Quoted 2 lines
These are a few more minor fixes that I would like to have in 2.6.23 if at all possible.
I've pulled these into my net-2.6 tree and will push to Linus, thanks!