diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 9 | ||||
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/of.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/usb.c | 6 |
4 files changed, 13 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 7c63976b5b0c..ebbbfc7a193b 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -996,9 +996,8 @@ void ath9k_calculate_iter_data(struct ath_softc *sc, | |||
996 | struct ath_vif *avp; | 996 | struct ath_vif *avp; |
997 | 997 | ||
998 | /* | 998 | /* |
999 | * Pick the MAC address of the first interface as the new hardware | 999 | * The hardware will use primary station addr together with the |
1000 | * MAC address. The hardware will use it together with the BSSID mask | 1000 | * BSSID mask when matching addresses. |
1001 | * when matching addresses. | ||
1002 | */ | 1001 | */ |
1003 | memset(iter_data, 0, sizeof(*iter_data)); | 1002 | memset(iter_data, 0, sizeof(*iter_data)); |
1004 | memset(&iter_data->mask, 0xff, ETH_ALEN); | 1003 | memset(&iter_data->mask, 0xff, ETH_ALEN); |
@@ -1228,6 +1227,8 @@ static int ath9k_add_interface(struct ieee80211_hw *hw, | |||
1228 | list_add_tail(&avp->list, &avp->chanctx->vifs); | 1227 | list_add_tail(&avp->list, &avp->chanctx->vifs); |
1229 | } | 1228 | } |
1230 | 1229 | ||
1230 | ath9k_calculate_summary_state(sc, avp->chanctx); | ||
1231 | |||
1231 | ath9k_assign_hw_queues(hw, vif); | 1232 | ath9k_assign_hw_queues(hw, vif); |
1232 | 1233 | ||
1233 | an->sc = sc; | 1234 | an->sc = sc; |
@@ -1297,6 +1298,8 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw, | |||
1297 | 1298 | ||
1298 | ath_tx_node_cleanup(sc, &avp->mcast_node); | 1299 | ath_tx_node_cleanup(sc, &avp->mcast_node); |
1299 | 1300 | ||
1301 | ath9k_calculate_summary_state(sc, avp->chanctx); | ||
1302 | |||
1300 | mutex_unlock(&sc->mutex); | 1303 | mutex_unlock(&sc->mutex); |
1301 | } | 1304 | } |
1302 | 1305 | ||
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/of.c b/drivers/net/wireless/brcm80211/brcmfmac/of.c index eb3fce82a223..c824570ddea3 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/of.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/of.c | |||
@@ -40,8 +40,8 @@ void brcmf_of_probe(struct brcmf_sdio_dev *sdiodev) | |||
40 | return; | 40 | return; |
41 | 41 | ||
42 | irq = irq_of_parse_and_map(np, 0); | 42 | irq = irq_of_parse_and_map(np, 0); |
43 | if (irq < 0) { | 43 | if (!irq) { |
44 | brcmf_err("interrupt could not be mapped: err=%d\n", irq); | 44 | brcmf_err("interrupt could not be mapped\n"); |
45 | devm_kfree(dev, sdiodev->pdata); | 45 | devm_kfree(dev, sdiodev->pdata); |
46 | return; | 46 | return; |
47 | } | 47 | } |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c index b0ae7993e2e8..138691a1365a 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c | |||
@@ -19,10 +19,10 @@ | |||
19 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
20 | #include <linux/vmalloc.h> | 20 | #include <linux/vmalloc.h> |
21 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
22 | #include <linux/unaligned/access_ok.h> | ||
23 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
24 | #include <linux/bcma/bcma.h> | 23 | #include <linux/bcma/bcma.h> |
25 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
25 | #include <asm/unaligned.h> | ||
26 | 26 | ||
27 | #include <soc.h> | 27 | #include <soc.h> |
28 | #include <chipcommon.h> | 28 | #include <chipcommon.h> |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c index 5265aa70b094..4572defc280f 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c | |||
@@ -738,10 +738,12 @@ static int brcmf_usb_dl_cmd(struct brcmf_usbdev_info *devinfo, u8 cmd, | |||
738 | goto finalize; | 738 | goto finalize; |
739 | } | 739 | } |
740 | 740 | ||
741 | if (!brcmf_usb_ioctl_resp_wait(devinfo)) | 741 | if (!brcmf_usb_ioctl_resp_wait(devinfo)) { |
742 | usb_kill_urb(devinfo->ctl_urb); | ||
742 | ret = -ETIMEDOUT; | 743 | ret = -ETIMEDOUT; |
743 | else | 744 | } else { |
744 | memcpy(buffer, tmpbuf, buflen); | 745 | memcpy(buffer, tmpbuf, buflen); |
746 | } | ||
745 | 747 | ||
746 | finalize: | 748 | finalize: |
747 | kfree(tmpbuf); | 749 | kfree(tmpbuf); |