diff options
| author | Andy Green <andy.green@linaro.org> | 2011-05-02 12:42:59 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-05-02 12:42:59 +0800 |
| commit | 950903b0cbcab05a0ce83afa40fa21ca2e6b6087 (patch) | |
| tree | 3d30025e81f4518ee32f123e579139138cdc9e9b /drivers/net/wireless/wl12xx/rx.c | |
| parent | 0feee712834280f94abca9b29e793a80bcf0560c (diff) | |
backport fixups for 2.6.38 mac80211
After pulling from wl12xx git HEAD, the following APIs had changed in the 2.6.39-rc5 basis
mac80211 at that branch. So these work around the changes in the 8 places.
When linux-linaro-2.6.39 comes with new mac80211 this patch can be discarded.
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'drivers/net/wireless/wl12xx/rx.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/rx.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/rx.c b/drivers/net/wireless/wl12xx/rx.c index 70091035e01..5aeed395e8a 100644 --- a/drivers/net/wireless/wl12xx/rx.c +++ b/drivers/net/wireless/wl12xx/rx.c @@ -72,8 +72,11 @@ static void wl1271_rx_status(struct wl1271 *wl, */ wl->noise = desc->rssi - (desc->snr >> 1); - status->freq = ieee80211_channel_to_frequency(desc->channel, - status->band); + status->freq = ieee80211_channel_to_frequency(desc->channel +#if 0 + , status->band +#endif + ); if (desc->flags & WL1271_RX_DESC_ENCRYPT_MASK) { u8 desc_err_code = desc->status & WL1271_RX_DESC_STATUS_MASK; |