aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHante Meuleman <meuleman@broadcom.com>2014-10-28 14:56:15 +0100
committerJohn W. Linville <linville@tuxdriver.com>2014-10-30 15:26:45 -0400
commit76b5a96d1df10535c7e2e7f876f2230e243aa7b8 (patch)
tree839b667218f1274abbd83a2071f2087a9c7b7cee
parentbrcmfmac: (clean) Rename dhd_bus.h in bus.h (diff)
downloadlinux-dev-76b5a96d1df10535c7e2e7f876f2230e243aa7b8.tar.xz
linux-dev-76b5a96d1df10535c7e2e7f876f2230e243aa7b8.zip
brcmfmac: (clean) Rename dhd_common.c in common.c
Reviewed-by: Arend Van Spriel <arend@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Signed-off-by: Hante Meuleman <meuleman@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/Makefile2
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/common.c (renamed from drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c)4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/brcm80211/brcmfmac/Makefile
index 1da9042c8aba..f6e35c95b829 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/Makefile
+++ b/drivers/net/wireless/brcm80211/brcmfmac/Makefile
@@ -30,7 +30,7 @@ brcmfmac-objs += \
fwsignal.o \
p2p.o \
proto.o \
- dhd_common.o \
+ common.o \
dhd_linux.o \
firmware.o \
feature.o \
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/common.c
index 7723994136a1..75642e46c37a 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/common.c
@@ -52,9 +52,9 @@ bool brcmf_c_prec_enq(struct device *dev, struct pktq *q,
}
/* Determine precedence from which to evict packet, if any */
- if (pktq_pfull(q, prec))
+ if (pktq_pfull(q, prec)) {
eprec = prec;
- else if (pktq_full(q)) {
+ } else if (pktq_full(q)) {
p = brcmu_pktq_peek_tail(q, &eprec);
if (eprec > prec)
return false;