diff options
| author | John W. Linville | 2013-03-29 21:41:36 +0100 |
|---|---|---|
| committer | John W. Linville | 2013-03-29 21:41:36 +0100 |
| commit | 9a574cd67a447059f9c14bbef47873315d7f7b35 (patch) | |
| tree | 0ebb71d213d868d8884b1fa0e05b7393c66c665b /drivers/net/wireless/mwifiex/pcie.c | |
| parent | brcmsmac: remove some pmu functions and use the bcma equivalents (diff) | |
| parent | b43: N-PHY: use more bits for offset in RSSI calibration (diff) | |
| download | kernel-qcow2-linux-9a574cd67a447059f9c14bbef47873315d7f7b35.tar.gz kernel-qcow2-linux-9a574cd67a447059f9c14bbef47873315d7f7b35.tar.xz kernel-qcow2-linux-9a574cd67a447059f9c14bbef47873315d7f7b35.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/sta_info.c
net/wireless/core.h
Diffstat (limited to 'drivers/net/wireless/mwifiex/pcie.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/pcie.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c index b5ff9f1f69c5..856959b64bc7 100644 --- a/drivers/net/wireless/mwifiex/pcie.c +++ b/drivers/net/wireless/mwifiex/pcie.c @@ -1519,6 +1519,7 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter) } memcpy(adapter->upld_buf, skb->data, min_t(u32, MWIFIEX_SIZE_OF_CMD_BUFFER, skb->len)); + skb_push(skb, INTF_HEADER_LEN); if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE, PCI_DMA_FROMDEVICE)) return -1; |