pull request: wireless 2012-01-04 #2
Subsystems (5)
Dave,
Here are a handful of straggler wireless fixes for 3.2. Included is a NULL pointer fix for mwifiex, a regression fix for handling rx header lengths for differnt b43 firmwares in PIO mode, a revert of a one-liner for Bluetooth HCI that was causing uncomfortable delays during resume, and an ath9k fix for a panic when running in AP mode with aggregation disabled.
The Bluetooth fix is a one-liner change of a delay value. The mwifiex, b43, and ath9k fixes are relatively small and isolated to their respective drivers.
Please let me know if there are problems!
John
---
The following changes since commit 405cc2736527bd506fd8f652308b03b2c8a1e8b9:
fix CAN MAINTAINERS SCM tree type (2012-01-03 14:57:43 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
Amitkumar Karwar (1):
mwifiex: fix crash during simultaneous scan and connect
Guennadi Liakhovetski (1):
b43: fix regression in PIO case
Gustavo F. Padovan (1):
Revert "Bluetooth: Increase HCI reset timeout in hci_dev_do_close"
John W. Linville (2):
Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
Mohammed Shafi Shajakhan (1):
ath9k: Fix kernel panic in AR2427 in AP mode
drivers/net/wireless/ath/ath9k/main.c | 3 +++ drivers/net/wireless/b43/pio.c | 16 +++++++++++++--- drivers/net/wireless/mwifiex/sta_ioctl.c | 7 ++++++- net/bluetooth/hci_core.c | 2 +- 4 files changed, 23 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +3 -0
@@ -1843,6 +1843,9 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw,struct ath_softc *sc = hw->priv;struct ath_node *an = (struct ath_node *) sta->drv_priv; +if (!(sc->sc_flags &SC_OP_TXAGGR )) +return ; +switch (cmd) {case STA_NOTIFY_SLEEP : an->sleeping = true;
drivers/net/wireless/b43/pio.c +13 -3
@@ -617,9 +617,19 @@ static bool pio_rx_frame(struct b43_pio_rxqueue *q)const char *err_msg =NULL ;struct b43_rxhdr_fw4 *rxhdr = (struct b43_rxhdr_fw4 *)wl->pio_scratchspace; +size_t rxhdr_size =sizeof (*rxhdr);BUILD_BUG_ON (sizeof (wl->pio_scratchspace) <sizeof (*rxhdr)); -memset (rxhdr,0 ,sizeof (*rxhdr)); +switch (dev->fw.hdr_format) { +case B43_FW_HDR_410 : +case B43_FW_HDR_351 : + rxhdr_size -=sizeof (rxhdr->format_598) - +sizeof (rxhdr->format_351); +break ; +case B43_FW_HDR_598 : +break ; + } +memset (rxhdr,0 , rxhdr_size);/* Check if we have data and wait for it to get ready. */ if (q->rev >=8 ) {
@@ -657,11 +667,11 @@ data_ready:/* Get the preamble (RX header) */ if (q->rev >=8 ) { -b43_block_read (dev, rxhdr,sizeof (*rxhdr), +b43_block_read (dev, rxhdr, rxhdr_size, q->mmio_base +B43_PIO8_RXDATA ,sizeof (u32)); }else { -b43_block_read (dev, rxhdr,sizeof (*rxhdr), +b43_block_read (dev, rxhdr, rxhdr_size, q->mmio_base +B43_PIO_RXDATA ,sizeof (u16)); }
drivers/net/wireless/mwifiex/sta_ioctl.c +6 -1
@@ -55,9 +55,14 @@ int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter) {bool cancel_flag = false;int status = adapter->cmd_wait_q.status; -struct cmd_ctrl_node *cmd_queued = adapter->cmd_queued; +struct cmd_ctrl_node *cmd_queued; +if (!adapter->cmd_queued) +return 0 ; + + cmd_queued = adapter->cmd_queued; adapter->cmd_queued =NULL ; +dev_dbg (adapter->dev,"cmd pending\n" );atomic_inc (&adapter->cmd_pending);
net/bluetooth/hci_core.c +1 -1
@@ -613,7 +613,7 @@ static int hci_dev_do_close(struct hci_dev *hdev)if (!test_bit (HCI_RAW , &hdev->flags)) {set_bit (HCI_INIT , &hdev->flags);__hci_request (hdev, hci_reset_req,0 , -msecs_to_jiffies (HCI_INIT_TIMEOUT )); +msecs_to_jiffies (250 ));clear_bit (HCI_INIT , &hdev->flags); }
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
Quoted 17 lines · John W. Linville
Dave,
Here are a handful of straggler wireless fixes for 3.2. Included is a NULL pointer fix for mwifiex, a regression fix for handling rx header lengths for differnt b43 firmwares in PIO mode, a revert of a one-liner for Bluetooth HCI that was causing uncomfortable delays during resume, and an ath9k fix for a panic when running in AP mode with aggregation disabled.
The Bluetooth fix is a one-liner change of a delay value. The mwifiex, b43, and ath9k fixes are relatively small and isolated to their respective drivers.
Please let me know if there are problems!
John
Quoted 8 lines
---
The following changes since commit
405cc2736527bd506fd8f652308b03b2c8a1e8b9:fix CAN
MAINTAINERSSCM tree type (2012-01-03 14:57:43 -0500)are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.gitfor-davem
The top of the tree here is commit d8f46ff11081f03b09efe82245a3257bab6bf60e.
Thanks,
John
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
David Miller
maintainerFrom: "John W. Linville" <[email protected]>
Date: Wed, 4 Jan 2012 11:43:40 -0500
Quoted 12 lines
Here are a handful of straggler wireless fixes for 3.2. Included is a NULL pointer fix for mwifiex, a regression fix for handling rx header lengths for differnt b43 firmwares in PIO mode, a revert of a one-liner for Bluetooth HCI that was causing uncomfortable delays during resume, and an ath9k fix for a panic when running in AP mode with aggregation disabled.
The Bluetooth fix is a one-liner change of a delay value. The mwifiex, b43, and ath9k fixes are relatively small and isolated to their respective drivers.
Please let me know if there are problems!
...
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.gitfor-davem
Pulled, thanks.