diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-09 20:49:23 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-09 20:49:23 +0100 |
| commit | 5e819059a20b0fc5a71875f28b4cae359e38d85a (patch) | |
| tree | b94a18142abc5e60c84f90ee2490e8a6af01c2a9 /drivers/net/wireless/brcm80211 | |
| parent | mac80211: allow frame aggregation for mesh (diff) | |
| parent | wl12xx: fix wl12xx_scan_sched_scan_ssid_list() check that all given ssids are... (diff) | |
| download | linux-5e819059a20b0fc5a71875f28b4cae359e38d85a.tar.xz linux-5e819059a20b0fc5a71875f28b4cae359e38d85a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/brcm80211')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/dma.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/brcm80211/brcmsmac/dma.c index ae541fbb4475..e286fb4d4813 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c @@ -358,13 +358,14 @@ static uint nrxdactive(struct dma_info *di, uint h, uint t) static uint _dma_ctrlflags(struct dma_info *di, uint mask, uint flags) { - uint dmactrlflags = di->dma.dmactrlflags; + uint dmactrlflags; if (di == NULL) { - DMA_ERROR(("%s: _dma_ctrlflags: NULL dma handle\n", di->name)); + DMA_ERROR(("_dma_ctrlflags: NULL dma handle\n")); return 0; } + dmactrlflags = di->dma.dmactrlflags; dmactrlflags &= ~mask; dmactrlflags |= flags; |