diff options
| author | John Crispin <john@phrozen.org> | 2018-06-22 09:43:56 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-06-22 09:45:43 +0200 |
| commit | 6e4fb77f9e3fb2a80759bdf987eadd2b1ffa84ad (patch) | |
| tree | 22f87184fc1e9385e2af610bae20185b859a9433 /package/kernel/mac80211/patches/312-v4.16-0006-brcmfmac-Remove-brcmf_sdiod_addrprep.patch | |
| parent | 642acc0fb072aacc039434e206627afc3b59c754 (diff) | |
| download | upstream-6e4fb77f9e3fb2a80759bdf987eadd2b1ffa84ad.tar.gz upstream-6e4fb77f9e3fb2a80759bdf987eadd2b1ffa84ad.tar.bz2 upstream-6e4fb77f9e3fb2a80759bdf987eadd2b1ffa84ad.zip | |
mac80211: drop 355-ath9k-limit-retries-for-powersave-response-frames.patch
several people reported this bug to be causing drop out issues
Signed-off-by: John Crispin <john@phrozen.org>
(cherry picked from commit cac1a4be66f548735878beccc10dc4b1ec7ad364)
Diffstat (limited to 'package/kernel/mac80211/patches/312-v4.16-0006-brcmfmac-Remove-brcmf_sdiod_addrprep.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/312-v4.16-0006-brcmfmac-Remove-brcmf_sdiod_addrprep.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/kernel/mac80211/patches/312-v4.16-0006-brcmfmac-Remove-brcmf_sdiod_addrprep.patch b/package/kernel/mac80211/patches/312-v4.16-0006-brcmfmac-Remove-brcmf_sdiod_addrprep.patch index 44303fa410..dc598aa471 100644 --- a/package/kernel/mac80211/patches/312-v4.16-0006-brcmfmac-Remove-brcmf_sdiod_addrprep.patch +++ b/package/kernel/mac80211/patches/312-v4.16-0006-brcmfmac-Remove-brcmf_sdiod_addrprep.patch @@ -62,10 +62,10 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> + if (!err) sdiodev->sbwad = bar0; - } -- + - *addr &= SBSDIO_SB_OFT_ADDR_MASK; - *addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; - +- - return 0; + return err; } @@ -99,14 +99,14 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org> + retval = brcmf_sdiod_set_backplane_window(sdiodev, addr); + if (retval) + goto out; -+ -+ addr &= SBSDIO_SB_OFT_ADDR_MASK; -+ addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; - if (!retval) - sdio_writel(sdiodev->func[1], data, addr, &retval); -+ sdio_writel(sdiodev->func[1], data, addr, &retval); ++ addr &= SBSDIO_SB_OFT_ADDR_MASK; ++ addr |= SBSDIO_SB_ACCESS_2_4B_FLAG; ++ sdio_writel(sdiodev->func[1], data, addr, &retval); ++ +out: if (ret) *ret = retval; |