diff --git a/drivers/net/wireless/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/brcm80211/brcmfmac/Makefile
index 1da9042c8aba0fb7b902cebc97972d74f7e8040d..f6e35c95b829bfb35cabf6439351042656f267bf 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
similarity index 99%
rename from drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
rename to drivers/net/wireless/brcm80211/brcmfmac/common.c
index 7723994136a1e3b831a80f594fe6bb122dfe9d7f..75642e46c37adf004e36c21e074db4d7ed348158 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;