summaryrefslogtreecommitdiffstats
path: root/drivers/staging/brcm80211/brcmsmac/phy
diff options
context:
space:
mode:
authorArend van Spriel2011-08-26 15:19:29 +0200
committerGreg Kroah-Hartman2011-08-26 19:53:10 +0200
commit0a980d455baef8194105702c85834a0368172fe0 (patch)
tree4781b62953ede2a9c24041aeec0b3d11a37b997c /drivers/staging/brcm80211/brcmsmac/phy
parentstaging: brcm80211: remove unused definition flag from top Makefile (diff)
downloadkernel-qcow2-linux-0a980d455baef8194105702c85834a0368172fe0.tar.gz
kernel-qcow2-linux-0a980d455baef8194105702c85834a0368172fe0.tar.xz
kernel-qcow2-linux-0a980d455baef8194105702c85834a0368172fe0.zip
staging: brcm80211: remove macro definitions from brcmsmac Makefile
The Makefile for the brcmsmac driver contains macro definitions that are always set and even some are not used in the source code anymore. This patch removes those definitions from the Makefile and source code. Reported-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com> Reviewed-by: Roland Vossen <rvossen@broadcom.com> Signed-off-by: Roland Vossen <rvossen@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmsmac/phy')
-rw-r--r--drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
index 5307bd8c258d..cbb0bde439ee 100644
--- a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
@@ -1666,13 +1666,10 @@ void wlc_phy_txpower_recalc_target(struct brcms_phy *pi)
}
}
}
-#if WL11N
+
max_num_rate = ((ISNPHY(pi)) ? (TXP_NUM_RATES) :
((ISLCNPHY(pi)) ?
(TXP_LAST_SISO_MCS_20 + 1) : (TXP_LAST_OFDM + 1)));
-#else
- max_num_rate = ((ISNPHY(pi)) ? (TXP_NUM_RATES) : (TXP_LAST_OFDM + 1));
-#endif
wlc_phy_upd_env_txpwr_rate_limits(pi, band);