Skip to content

Commit

Permalink
brcm80211: smac: remove phy api bypass in rate.h
Browse files Browse the repository at this point in the history
Obviously the phy api should be used to interface with the phy. In
rate.h a table within phy was accessed directly by declaring the
table extern in rate.h itself. This patch fixes this using the
provided api function to obtain the table reference. This bypass
was found by a sparse warning on the table not being defined static.

Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Arend van Spriel authored and John W. Linville committed Nov 8, 2011
1 parent 094b199 commit 1433c59
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ static const struct chan_info_basic chan_info_all[] = {
{216, 50800}
};

const u8 ofdm_rate_lookup[] = {
static const u8 ofdm_rate_lookup[] = {

BRCM_RATE_48M,
BRCM_RATE_24M,
Expand Down
5 changes: 2 additions & 3 deletions drivers/net/wireless/brcm80211/brcmsmac/rate.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

#include "types.h"
#include "d11.h"
#include "phy_hal.h"

extern const u8 rate_info[];
extern const struct brcms_c_rateset cck_ofdm_mimo_rates;
Expand Down Expand Up @@ -198,11 +199,9 @@ static inline u8 cck_rspec(u8 cck)

/* Convert encoded rate value in plcp header to numerical rates in 500 KHz
* increments */
extern const u8 ofdm_rate_lookup[];

static inline u8 ofdm_phy2mac_rate(u8 rlpt)
{
return ofdm_rate_lookup[rlpt & 0x7];
return wlc_phy_get_ofdm_rate_lookup()[rlpt & 0x7];
}

static inline u8 cck_phy2mac_rate(u8 signal)
Expand Down

0 comments on commit 1433c59

Please sign in to comment.