Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  fix CAN MAINTAINERS SCM tree type
  mwifiex: fix crash during simultaneous scan and connect
  b43: fix regression in PIO case
  ath9k: Fix kernel panic in AR2427 in AP mode
  CAN MAINTAINERS update
  net: fsl: fec: fix build for mx23-only kernel
  sch_qfq: fix overflow in qfq_update_start()
  Revert "Bluetooth: Increase HCI reset timeout in hci_dev_do_close"

4 files changed, 24 insertions, 6 deletions

diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig
index 5272f9d4dda..9de37642f09 100644
--- a/drivers/net/ethernet/freescale/Kconfig
+++ b/drivers/net/ethernet/freescale/Kconfig
@@ -23,8 +23,8 @@ if NET_VENDOR_FREESCALE
 config FEC
         bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
         depends on (M523x || M527x || M5272 || M528x || M520x || M532x || \
-                   ARCH_MXC || ARCH_MXS)
-        default ARCH_MXC || ARCH_MXS if ARM
+                   ARCH_MXC || SOC_IMX28)
+        default ARCH_MXC || SOC_IMX28 if ARM
         select PHYLIB
         ---help---
           Say Y here if you want to use the built-in 10/100 Fast ethernet
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index d2348a5a780..a9c5ae75277 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -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;
diff --git a/drivers/net/wireless/b43/pio.c b/drivers/net/wireless/b43/pio.c
index fcff923b3c1..279a53eae4c 100644
--- a/drivers/net/wireless/b43/pio.c
+++ b/drivers/net/wireless/b43/pio.c
@@ -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));
         }
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index ea4a29b7e33..1679c2593b7 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -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);