What's new in wireless-dev?
I apologize for the announcement delay -- I had a hiccup w/ my mail server this weekend...
---
The following changes since commit a7bcae7c095077d89899b2bf0b8d81b8997f340f:
John W. Linville:
Merge branch 'from-linus'
are found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-dev.git
David Kimdon:
d80211: fix crash in ieee80211_rx_michael_mic_report()
Ivo van Doorn:
rt2x00: Add register revision and firmware version to ethtool
rt2x00: basic rate mask
rt2x00: Mac address reading optimization
rt2x00: add/remove interface fix
rt2x00: Register initialization fixes
rt2x00: Respect return values
rt2x00: Add ieee80211_netif_oper() calls
rt2x00: change variable name
rt2x00: TXD/RTS fixes
rt2x00: Misc fixes
Michael Buesch:
ssb: minor fixes and cleanups
ssb: add MAINTAINERS entry
bcm43xx-d80211: add support for 4312
ssb: fix core CC and REV reading
bcm43xx-d80211: 4311 support
MAINTAINERS | 6 + drivers/misc/ssb.c | 23 ++- drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c | 13 ++ .../net/wireless/d80211/bcm43xx/bcm43xx_power.c | 27 +++-- drivers/net/wireless/d80211/rt2x00/rt2400pci.c | 119 +++++++++++++----- drivers/net/wireless/d80211/rt2x00/rt2400pci.h | 15 ++ drivers/net/wireless/d80211/rt2x00/rt2500pci.c | 129 ++++++++++++++------ drivers/net/wireless/d80211/rt2x00/rt2500pci.h | 17 ++- drivers/net/wireless/d80211/rt2x00/rt2500usb.c | 127 +++++++++++++------ drivers/net/wireless/d80211/rt2x00/rt2500usb.h | 6 + drivers/net/wireless/d80211/rt2x00/rt2x00.h | 60 +++++++++ drivers/net/wireless/d80211/rt2x00/rt61pci.c | 132 ++++++++++++++------ drivers/net/wireless/d80211/rt2x00/rt61pci.h | 6 + drivers/net/wireless/d80211/rt2x00/rt73usb.c | 113 +++++++++++++---- drivers/net/wireless/d80211/rt2x00/rt73usb.h | 6 + include/linux/ssb.h | 46 ++++++- net/d80211/ieee80211.c | 7 + 17 files changed, 632 insertions(+), 220 deletions(-)
MAINTAINERS +6 -0
@@ -2650,6 +2650,12 @@ M: [email protected] L: [email protected] S: Maintained +SONICS SILICON BACKPLANE DRIVER (SSB) +P: Michael Buesch +M: [email protected] +L: [email protected] +S: Maintained + SONY VAIO CONTROL DEVICE DRIVER P: Stelian Pop M: [email protected]
drivers/misc/ssb.c +13 -10
@@ -518,7 +518,8 @@ int ssb_init(struct ssb *ssb, {int err; -if (!ssb || !pci_dev || !device_suspend || !device_resume) +if (!ssb || !pci_dev || !mmio || + !device_suspend || !device_resume)return -EINVAL ;memset (ssb,0 ,sizeof (*ssb));
@@ -551,9 +552,9 @@ void ssb_exit(struct ssb *ssb)list_del (&ssb->list);mutex_unlock (&ssb_list_mutex); +mutex_destroy (&ssb->suspend_mutex); +mutex_destroy (&ssb->mutex);kfree (ssb->cores); -if (SSB_DEBUG ) -memset (ssb,0x5B ,sizeof (*ssb)); }EXPORT_SYMBOL_GPL (ssb_exit);
@@ -592,8 +593,8 @@ error:return -ENODEV ; } -int ssb_switch_core_locked (struct ssb *ssb, -struct ssb_core *new_core) +static int ssb_switch_core_locked (struct ssb *ssb, +struct ssb_core *new_core) {int err =0 ;
@@ -642,8 +643,9 @@ int ssb_probe_cores(struct ssb *ssb, goto error; idhi =ssb_read32 (ssb,SSB_IDHIGH ); - cc = (idhi &SSB_IDHIGH_CC_MASK ) >>SSB_IDHIGH_CC_SHIFT ; - rev = (idhi &SSB_IDHIGH_RC_MASK ); + cc = (idhi &SSB_IDHIGH_CC ) >>SSB_IDHIGH_CC_SHIFT ; + rev = (idhi &SSB_IDHIGH_RCLO ); + rev |= (idhi &SSB_IDHIGH_RCHI ) >>SSB_IDHIGH_RCHI_SHIFT ; ssb->chipcommon_capabilities =0 ; ssb->nr_cores =0 ;
@@ -715,9 +717,10 @@ int ssb_probe_cores(struct ssb *ssb, core = &(ssb->cores[i]); idhi =ssb_read32 (ssb,SSB_IDHIGH ); - core->cc = (idhi &SSB_IDHIGH_CC_MASK ) >>SSB_IDHIGH_CC_SHIFT ; - core->rev = (idhi &SSB_IDHIGH_RC_MASK ); - core->vendor = (idhi &SSB_IDHIGH_VC_MASK ) >>SSB_IDHIGH_VC_SHIFT ; + core->cc = (idhi &SSB_IDHIGH_CC ) >>SSB_IDHIGH_CC_SHIFT ; + core->rev = (idhi &SSB_IDHIGH_RCLO ); + core->rev |= (idhi &SSB_IDHIGH_RCHI ) >>SSB_IDHIGH_RCHI_SHIFT ; + core->vendor = (idhi &SSB_IDHIGH_VC ) >>SSB_IDHIGH_VC_SHIFT ; core->index = i; dprintk(KERN_DEBUG PFX "Core %d found: "
drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c +10 -3
@@ -129,6 +129,10 @@ static struct pci_device_id bcm43xx_pci_ { PCI_VENDOR_ID_BROADCOM, 0x4301, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },/* Broadcom 4307 802.11b */ { PCI_VENDOR_ID_BROADCOM, 0x4307, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, +/* Broadcom 4311 802.11a/b/g */ + { PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, +/* Broadcom 4312 802.11a/b/g */ + { PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },/* Broadcom 4318 802.11b/g */ { PCI_VENDOR_ID_BROADCOM, 0x4318, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Broadcom 4319 802.11b/g */
@@ -2299,7 +2303,9 @@ static int bcm43xx_wireless_core_init(stu32 sbimconfiglow;u8 limit; -if (bcm->ssb.chip_rev <5 ) { +assert (bcm->core_pci); +if (bcm->core_pci->cc ==SSB_CC_PCI && + bcm->core_pci->rev <=5 ) { sbimconfiglow =bcm43xx_read32 (bcm,SSB_IMCFGLO ); sbimconfiglow &= ~SSB_IMCFGLO_REQTO ; sbimconfiglow &= ~SSB_IMCFGLO_SERTO ;
@@ -2710,6 +2716,7 @@ #endifswitch (core->cc) {case SSB_CC_PCI : +case SSB_CC_PCIE :if (bcm->core_pci) { printk(KERN_WARNING PFX "Multiple PCI cores found.\n");break ;
@@ -2742,7 +2749,7 @@ #endifswitch (core->rev) {case 2 :case 4 :case 5 :case 6 : -case 7 :case 9 : +case 7 :case 9 :case 10 :break ;default : printk(KERN_ERR PFX "Error: Unsupported 80211 core revision %u\n",
@@ -3247,7 +3254,7 @@ static int bcm43xx_read_phyinfo(struct b phy_rev_ok =0 ;break ;case BCM43xx_PHYTYPE_G: -if (phy_rev >7 ) +if (phy_rev >8 ) phy_rev_ok =0 ;break ;default :
drivers/net/wireless/d80211/bcm43xx/bcm43xx_power.c +20 -7
@@ -153,8 +153,6 @@ int bcm43xx_pctl_init(struct bcm43xx_priint err, maxfreq;struct ssb_core *old_core; -if (!(bcm->ssb.chipcommon_capabilities &SSB_CHIPCOMMON_CAP_PCTL )) -return 0 ;if (!bcm->core_chipcommon)return 0 ;
@@ -163,11 +161,26 @@ int bcm43xx_pctl_init(struct bcm43xx_priif (err) goto out; - maxfreq =bcm43xx_pctl_clockfreqlimit (bcm,1 ); -bcm43xx_write32 (bcm,SSB_CHIPCOMMON_PLLONDELAY , - (maxfreq *150 +999999 ) /1000000 ); -bcm43xx_write32 (bcm,SSB_CHIPCOMMON_FREFSELDELAY , - (maxfreq *15 +999999 ) /1000000 ); +if (bcm->ssb.chip_id ==0x4321 ) { +if (bcm->ssb.chip_rev ==0 ) +bcm43xx_write32 (bcm,SSB_CHIPCOMMON_CHIPCTL ,0x03A4 ); +else if (bcm->ssb.chip_rev ==1 ) +bcm43xx_write32 (bcm,SSB_CHIPCOMMON_CHIPCTL ,0x00A4 ); + } +if (bcm->ssb.chipcommon_capabilities &SSB_CHIPCOMMON_CAP_PCTL ) { +if (bcm->core_chipcommon->rev >=10 ) { +/* Set Idle Power clock rate to 1Mhz */ +bcm43xx_write32 (bcm,SSB_CHIPCOMMON_SYSCLKCTL , + (bcm43xx_read32 (bcm,SSB_CHIPCOMMON_SYSCLKCTL ) & +0x0000FFFF ) |0x00040000 ); + }else { + maxfreq =bcm43xx_pctl_clockfreqlimit (bcm,1 ); +bcm43xx_write32 (bcm,SSB_CHIPCOMMON_PLLONDELAY , + (maxfreq *150 +999999 ) /1000000 ); +bcm43xx_write32 (bcm,SSB_CHIPCOMMON_FREFSELDELAY , + (maxfreq *15 +999999 ) /1000000 ); + } + } err =ssb_switch_core (&bcm->ssb, old_core);assert (err ==0 );
drivers/net/wireless/d80211/rt2x00/rt2400pci.c +86 -33
295 lines not on this page · raw message
drivers/net/wireless/d80211/rt2x00/rt2400pci.h +14 -1
@@ -44,7 +44,7 @@ #define RF2421 0x0001#define CSR_REG_BASE 0x0000#define CSR_REG_SIZE 0x014c#define EEPROM_BASE 0x0000 -#define EEPROM_SIZE 0x00ff +#define EEPROM_SIZE 0x0100/* * Control/Status Registers(CSR).
@@ -705,6 +705,19 @@ #define RF3_TXPOWER FIELD32(0x00003e00*/ /* +* HW MAC address. +*/ +#define EEPROM_MAC_ADDR_0 0x0002 +#define EEPROM_MAC_ADDR_BYTE0 FIELD16(0x00ff) +#define EEPROM_MAC_ADDR_BYTE1 FIELD16(0xff00) +#define EEPROM_MAC_ADDR1 0x0003 +#define EEPROM_MAC_ADDR_BYTE2 FIELD16(0x00ff) +#define EEPROM_MAC_ADDR_BYTE3 FIELD16(0xff00) +#define EEPROM_MAC_ADDR_2 0x0004 +#define EEPROM_MAC_ADDR_BYTE4 FIELD16(0x00ff) +#define EEPROM_MAC_ADDR_BYTE5 FIELD16(0xff00) + +/* * EEPROM antenna. * ANTENNA_NUM: Number of antenna's. * TX_DEFAULT: Default antenna 0: diversity, 1: A, 2: B.
drivers/net/wireless/d80211/rt2x00/rt2500pci.c +92 -37
319 lines not on this page · raw message
drivers/net/wireless/d80211/rt2x00/rt2500pci.h +15 -2
@@ -55,7 +55,7 @@ #define RT2560_VERSION_D 4#define CSR_REG_BASE 0x0000#define CSR_REG_SIZE 0x0174#define EEPROM_BASE 0x0000 -#define EEPROM_SIZE 0x01ff +#define EEPROM_SIZE 0x0200/* * Control/Status Registers(CSR).
@@ -542,7 +542,7 @@ #define ARCSR1_AR_BBP_ID3 FIELD32(0xff0*/ /* -* PCISR: PCI control register. +* PCICSR: PCI control register. * BIG_ENDIAN: 1: big endian, 0: little endian. * RX_TRESHOLD: Rx threshold in dw to start pci access * 0: 16dw (default), 1: 8dw, 2: 4dw, 3: 32dw.
@@ -935,6 +935,19 @@ #define RF3_TXPOWER FIELD32(0x00003e00*/ /* +* HW MAC address. +*/ +#define EEPROM_MAC_ADDR_0 0x0002 +#define EEPROM_MAC_ADDR_BYTE0 FIELD16(0x00ff) +#define EEPROM_MAC_ADDR_BYTE1 FIELD16(0xff00) +#define EEPROM_MAC_ADDR1 0x0003 +#define EEPROM_MAC_ADDR_BYTE2 FIELD16(0x00ff) +#define EEPROM_MAC_ADDR_BYTE3 FIELD16(0xff00) +#define EEPROM_MAC_ADDR_2 0x0004 +#define EEPROM_MAC_ADDR_BYTE4 FIELD16(0x00ff) +#define EEPROM_MAC_ADDR_BYTE5 FIELD16(0xff00) + +/* * EEPROM antenna. * ANTENNA_NUM: Number of antenna's. * TX_DEFAULT: Default antenna 0: diversity, 1: A, 2: B.
drivers/net/wireless/d80211/rt2x00/rt2500usb.c +89 -38
337 lines not on this page · raw message
drivers/net/wireless/d80211/rt2x00/rt2500usb.h +4 -2
@@ -46,7 +46,7 @@ #define RF5222 0x0010* Register layout information. */ #define CSR_REG_BASE 0x0400 -#define CSR_REG_SIZE 0x00ff +#define CSR_REG_SIZE 0x0100#define EEPROM_BASE 0x0000#define EEPROM_SIZE 0x006a
@@ -492,11 +492,13 @@ #define RF3_TXPOWER FIELD32(0x00003e00/* * HW MAC address. */ -#define EEPROM_MAC_ADDR 0x0004 +#define EEPROM_MAC_ADDR_0 0x0004#define EEPROM_MAC_ADDR_BYTE0 FIELD16(0x00ff)#define EEPROM_MAC_ADDR_BYTE1 FIELD16(0xff00) +#define EEPROM_MAC_ADDR1 0x0006#define EEPROM_MAC_ADDR_BYTE2 FIELD16(0x00ff)#define EEPROM_MAC_ADDR_BYTE3 FIELD16(0xff00) +#define EEPROM_MAC_ADDR_2 0x0008#define EEPROM_MAC_ADDR_BYTE4 FIELD16(0x00ff)#define EEPROM_MAC_ADDR_BYTE5 FIELD16(0xff00)
drivers/net/wireless/d80211/rt2x00/rt2x00.h +57 -3
94 lines not on this page · raw message
drivers/net/wireless/d80211/rt2x00/rt61pci.c +91 -41
340 lines not on this page · raw message
drivers/net/wireless/d80211/rt2x00/rt61pci.h +4 -2
@@ -48,7 +48,7 @@ #define RF2529 0x0004#define CSR_REG_BASE 0x3000#define CSR_REG_SIZE 0x04b0#define EEPROM_BASE 0x0000 -#define EEPROM_SIZE 0x00ff +#define EEPROM_SIZE 0x0100/* * PCI registers.
@@ -991,11 +991,13 @@ #define RF4_FREQ_OFFSET FIELD32(0x0003/* * HW MAC address. */ -#define EEPROM_MAC_ADDR 0x0002 +#define EEPROM_MAC_ADDR_0 0x0002#define EEPROM_MAC_ADDR_BYTE0 FIELD16(0x00ff)#define EEPROM_MAC_ADDR_BYTE1 FIELD16(0xff00) +#define EEPROM_MAC_ADDR1 0x0004#define EEPROM_MAC_ADDR_BYTE2 FIELD16(0x00ff)#define EEPROM_MAC_ADDR_BYTE3 FIELD16(0xff00) +#define EEPROM_MAC_ADDR_2 0x0006#define EEPROM_MAC_ADDR_BYTE4 FIELD16(0x00ff)#define EEPROM_MAC_ADDR_BYTE5 FIELD16(0xff00)
drivers/net/wireless/d80211/rt2x00/rt73usb.c +84 -29
302 lines not on this page · raw message
drivers/net/wireless/d80211/rt2x00/rt73usb.h +4 -2
@@ -46,7 +46,7 @@ #define RF2527 0x0004#define CSR_REG_BASE 0x3000#define CSR_REG_SIZE 0x04b0#define EEPROM_BASE 0x0000 -#define EEPROM_SIZE 0x00ff +#define EEPROM_SIZE 0x0100/* * USB registers.
@@ -643,11 +643,13 @@ #define RF4_FREQ_OFFSET FIELD32(0x0003/* * HW MAC address. */ -#define EEPROM_MAC_ADDR 0x0004 +#define EEPROM_MAC_ADDR_0 0x0004#define EEPROM_MAC_ADDR_BYTE0 FIELD16(0x00ff)#define EEPROM_MAC_ADDR_BYTE1 FIELD16(0xff00) +#define EEPROM_MAC_ADDR1 0x0006#define EEPROM_MAC_ADDR_BYTE2 FIELD16(0x00ff)#define EEPROM_MAC_ADDR_BYTE3 FIELD16(0xff00) +#define EEPROM_MAC_ADDR_2 0x0008#define EEPROM_MAC_ADDR_BYTE4 FIELD16(0x00ff)#define EEPROM_MAC_ADDR_BYTE5 FIELD16(0xff00)
include/linux/ssb.h +38 -8
67 lines not on this page · raw message
net/d80211/ieee80211.c +5 -2
@@ -3582,6 +3582,11 @@ void __ieee80211_rx(struct net_device *delse sta = rx.sta =NULL ; +if (sta) { + rx.dev = sta->dev; + rx.sdata =IEEE80211_DEV_TO_SUB_IF (rx.dev); + } +if ((status->flag &RX_FLAG_MMIC_ERROR )) {ieee80211_rx_michael_mic_report (dev, hdr, sta, &rx); goto end;
@@ -3597,8 +3602,6 @@ void __ieee80211_rx(struct net_device *dif (sta && !sta->assoc_ap && !(sta->flags &WLAN_STA_WDS ) && !local->iff_promiscs && !multicast) { - rx.dev = sta->dev; - rx.sdata =IEEE80211_DEV_TO_SUB_IF (rx.dev); rx.u.rx.ra_match =1 ;ieee80211_invoke_rx_handlers (local, local->rx_handlers, &rx, sta);
Signature · 2 lines
John W. Linville [email protected]