forked from luck/tmp_suning_uos_patched
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
This commit is contained in:
commit
d8f46ff110
|
@ -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;
|
||||
|
|
|
@ -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 @@ static bool pio_rx_frame(struct b43_pio_rxqueue *q)
|
|||
|
||||
/* 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));
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user