Please pull 'fixes-davem' branch of wireless-2.6
Dave,
Two more fixes for 2.6.24. I think they are self-explanatory -- let me know if I'm too optimistic! :-)
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 3ce54450461bad18bbe1f9f5aa3ecd2f8e8d1235:
Linus Torvalds (1):
Linux 2.6.24-rc7
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git fixes-davem
Andrew Lutomirski (1):
mac80211: return an error when SIWRATE doesn't match any rate
Michael Buesch (1):
ssb: Fix probing of PCI cores if PCI and PCIE core is available
drivers/ssb/scan.c | 11 +++++++++++ net/mac80211/ieee80211_ioctl.c | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-)
drivers/ssb/scan.c +11 -0
@@ -388,6 +388,17 @@ int ssb_bus_scan(struct ssb_bus *bus,case SSB_DEV_PCI :case SSB_DEV_PCIE :#ifdef CONFIG_SSB_DRIVER_PCICORE +if (bus->bustype ==SSB_BUSTYPE_PCI ) { +/* Ignore PCI cores on PCI-E cards. +* Ignore PCI-E cores on PCI cards. */ +if (dev->id.coreid ==SSB_DEV_PCI ) { +if (bus->host_pci->is_pcie) +continue ; + }else { +if (!bus->host_pci->is_pcie) +continue ; + } + }if (bus->pcicore.dev) { ssb_printk(KERN_WARNING PFX "WARNING: Multiple PCI(E) cores found\n");
net/mac80211/ieee80211_ioctl.c +3 -3
@@ -591,7 +591,7 @@ static int ieee80211_ioctl_siwrate(struct net_device *dev, sdata->bss->force_unicast_rateidx =-1 ;if (rate->value <0 )return 0 ; -for (i=0 ; i< mode->num_rates; i++) { +for (i=0 ; i < mode->num_rates; i++) {struct ieee80211_rate *rates = &mode->rates[i];int this_rate = rates->rate;
@@ -599,10 +599,10 @@ static int ieee80211_ioctl_siwrate(struct net_device *dev, sdata->bss->max_ratectrl_rateidx = i;if (rate->fixed) sdata->bss->force_unicast_rateidx = i; -break ; +return 0 ; } } -return 0 ; +return -EINVAL ; } static int ieee80211_ioctl_giwrate(struct net_device *dev,
Signature · 2 lines
John W. Linville [email protected]
From: "John W. Linville" <[email protected]>
Date: Tue, 8 Jan 2008 00:14:25 -0500
Quoted 2 lines
Two more fixes for 2.6.24. I think they are self-explanatory -- let me know if I'm too optimistic! :-)
Thanks John, I'll pull these in shortly.