diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-07-13 14:25:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-13 14:25:13 -0700 |
| commit | fae88f7eedae42c955075aec7a0cd27545f81511 (patch) | |
| tree | a14895b1d5d5881dfb9eddb23a2ab270e14dc4a7 /drivers/net/wireless/wl12xx/wl1271_rx.c | |
| parent | Revert "tc35815: fix iomap leak" (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem (diff) | |
| download | linux-dev-fae88f7eedae42c955075aec7a0cd27545f81511.tar.xz linux-dev-fae88f7eedae42c955075aec7a0cd27545f81511.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_rx.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_rx.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_rx.c b/drivers/net/wireless/wl12xx/wl1271_rx.c index b98fb643fab0..e98f22b3c3ba 100644 --- a/drivers/net/wireless/wl12xx/wl1271_rx.c +++ b/drivers/net/wireless/wl12xx/wl1271_rx.c @@ -53,12 +53,6 @@ static void wl1271_rx_status(struct wl1271 *wl, status->band = wl->band; status->rate_idx = wl1271_rate_to_idx(wl, desc->rate); - /* - * FIXME: Add mactime handling. For IBSS (ad-hoc) we need to get the - * timestamp from the beacon (acx_tsf_info). In BSS mode (infra) we - * only need the mactime for monitor mode. For now the mactime is - * not valid, so RX_FLAG_TSFT should not be set - */ status->signal = desc->rssi; status->freq = ieee80211_channel_to_frequency(desc->channel); |