Please pull 'upstream-fixes' branch of wireless-2.6
Subsystems (3)
This pull is intended for 2.6.17 if at all possible.
Thanks,
John
---
The following changes since commit 672c6108a51bf559d19595d9f8193dfd81f0f752:
Linus Torvalds:
Merge master.kernel.org:/.../jejb/scsi-rc-fixes-2.6
are found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-fixes
Michael Buesch:
bcm43xx: add DMA rx poll workaround to DMA4
drivers/net/wireless/bcm43xx/bcm43xx_dma.c | 31 ++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 9 deletions(-)
drivers/net/wireless/bcm43xx/bcm43xx_dma.c +22 -9
@@ -624,25 +624,28 @@ err_destroy_tx0:static u16 generate_cookie (struct bcm43xx_dmaring *ring,int slot) { -u16 cookie =0x0000 ; +u16 cookie =0xF000 ;/* Use the upper 4 bits of the cookie as * DMA controller ID and store the slot number -* in the lower 12 bits +* in the lower 12 bits. +* Note that the cookie must never be 0, as this +* is a special value used in RX path. */ switch (ring->mmio_base) {default :assert (0 );case BCM43xx_MMIO_DMA1_BASE: + cookie =0xA000 ;break ;case BCM43xx_MMIO_DMA2_BASE: - cookie =0x1000 ; + cookie =0xB000 ;break ;case BCM43xx_MMIO_DMA3_BASE: - cookie =0x2000 ; + cookie =0xC000 ;break ;case BCM43xx_MMIO_DMA4_BASE: - cookie =0x3000 ; + cookie =0xD000 ;break ; }assert (((u16 )slot &0xF000 ) ==0x0000 );
@@ -660,16 +663,16 @@ struct bcm43xx_dmaring * parse_cookie(ststruct bcm43xx_dmaring *ring =NULL ;switch (cookie &0xF000 ) { -case 0x0000 : +case 0xA000 : ring = dma->tx_ring0;break ; -case 0x1000 : +case 0xB000 : ring = dma->tx_ring1;break ; -case 0x2000 : +case 0xC000 : ring = dma->tx_ring2;break ; -case 0x3000 : +case 0xD000 : ring = dma->tx_ring3;break ;default :
@@ -839,8 +842,18 @@ static void dma_rx(struct bcm43xx_dmarin/* We received an xmit status. */ struct bcm43xx_hwxmitstatus *hw = (struct bcm43xx_hwxmitstatus *)skb->data;struct bcm43xx_xmitstatus stat; +int i =0 ; stat.cookie =le16_to_cpu (hw->cookie); +while (stat.cookie ==0 ) { +if (unlikely (++i >=10000 )) { +assert (0 ); +break ; + } +udelay (2 ); +barrier (); + stat.cookie =le16_to_cpu (hw->cookie); + } stat.flags = hw->flags; stat.cnt1 = hw->cnt1; stat.cnt2 = hw->cnt2;
Signature · 2 lines
John W. Linville [email protected]
Please pull 'upstream' branch of wireless-2.6
This pull is intended for 2.6.18.
Thanks,
John
---
The following changes since commit f6882a0688ea83db5fc2f3491ac9fcdce0834cc7:
John W. Linville:
Merge branch 'upstream-fixes' into upstream
are found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream
Daniel Drake:
softmac: complete shared key authentication
softmac: Fix handling of authentication failure
Jason Lunz:
bcm43xx: quiet down log spam from set_security
Joseph Jezak:
softmac: unified capabilities computation
Pavel Machek:
usb wifi: zd1201 cleanups
wireless: move zd1201 where it belongs
Toralf Förster:
ieee80211softmac_io.c: fix warning "defined but not used"
drivers/net/wireless/Kconfig | 17 ++
drivers/net/wireless/Makefile | 2
drivers/net/wireless/bcm43xx/bcm43xx_main.c | 13 +-
drivers/net/wireless/zd1201.c | 67 ++++------
drivers/net/wireless/zd1201.h | 0
drivers/usb/net/Kconfig | 17 --
drivers/usb/net/Makefile | 1
include/net/ieee80211.h | 3
include/net/ieee80211softmac.h | 2
net/ieee80211/ieee80211_tx.c | 25 +++-
net/ieee80211/softmac/Kconfig | 1
net/ieee80211/softmac/ieee80211softmac_assoc.c | 22 +++
net/ieee80211/softmac/ieee80211softmac_auth.c | 12 +-
net/ieee80211/softmac/ieee80211softmac_event.c | 5 +
net/ieee80211/softmac/ieee80211softmac_io.c | 169 +++++++++++-------------
15 files changed, 180 insertions(+), 176 deletions(-)
rename drivers/{usb/net/zd1201.c => net/wireless/zd1201.c} (98%)
rename drivers/{usb/net/zd1201.h => net/wireless/zd1201.h} (100%)Patch included as attachment "upstream.patch.bz2"
Signature · 2 lines
John W. Linville [email protected]
Quoted 8 lines · John W. Linville
This pull is intended for 2.6.17 if at all possible.
Thanks,
John
---
Quoted 7 lines
The following changes since commit
672c6108a51bf559d19595d9f8193dfd81f0f752:
Linus Torvalds:Merge master.kernel.org:/.../jejb/scsi-rc-fixes-2.6are found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.gitupstream-fixes
pulled
Jeff Garzik
AppliedRe: Please pull 'upstream' branch of wireless-2.6
In reply to John W. LinvilleQuoted 8 lines · John W. Linville
This pull is intended for 2.6.18.
Thanks,
John
---
Quoted 7 lines
The following changes since commit
f6882a0688ea83db5fc2f3491ac9fcdce0834cc7:
John W. Linville:
Merge branch 'upstream-fixes' into upstreamare found in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.gitupstream
applied