diff options
| author | David S. Miller <davem@davemloft.net> | 2016-07-14 16:27:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-14 16:32:27 -0700 |
| commit | 88b3ec527416f95ac4eae3cd458249143105deb8 (patch) | |
| tree | 601973e8ccc882145068c77ef6be013307a18a36 /drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c | |
| parent | d8c62a91f7fd4239576d105b741140434e5368a0 (diff) | |
| parent | 25f700ef0653d7644ed273f8770230e734cae726 (diff) | |
| download | linux-88b3ec527416f95ac4eae3cd458249143105deb8.tar.bz2 | |
Merge tag 'wireless-drivers-next-for-davem-2016-07-13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers-next patches for 4.8
Major changes:
iwlwifi
* more work on the RX path for the 9000 device series
* some more dynamic queue allocation work
* SAR BIOS implementation
* some work on debugging capabilities
* added support for GCMP encryption
* data path rework in preparation for new HW
* some cleanup to remove transport dependency on mac80211
* support for MSIx in preparation for new HW
* lots of work in preparation for HW support (9000 and a000 series)
mwifiex
* implement get_tx_power and get_antenna cfg80211 operation callbacks
wl18xx
* add support for 64bit clock
rtl8xxxu
* aggregation support (optional for now)
Also wireless-drivers is merged to fix some conflicts.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c')
| -rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c index e16ee60639f5..c2a938b59044 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c @@ -3349,8 +3349,8 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc) dma_rxfill(wlc_hw->di[RX_FIFO]); } -void -static brcms_b_init(struct brcms_hardware *wlc_hw, u16 chanspec) { +static void brcms_b_init(struct brcms_hardware *wlc_hw, u16 chanspec) +{ u32 macintmask; bool fastclk; struct brcms_c_info *wlc = wlc_hw->wlc; |