Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / drivers / net / wireless / wl12xx / wl1251_rx.c

diff --git a/drivers/net/wireless/wl12xx/wl1251_rx.c b/drivers/net/wireless/wl12xx/wl1251_rx.c
index 6f229e0990f4efc45d3a54facaad939d994cbf3c..af5c67b4da9558909bc40551d83a3f6f233391fd 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1251_rx.c
+++ b/drivers/net/wireless/wl12xx/wl1251_rx.c
@@ -74,12 +74,6 @@ static void wl1251_rx_status(struct wl1251 *wl,
 
        status->signal = desc->rssi;
 
-       /*
-        * FIXME: guessing that snr needs to be divided by two, otherwise
-        * the values don't make any sense
-        */
-       status->noise = desc->rssi - desc->snr / 2;
-
        status->freq = ieee80211_channel_to_frequency(desc->channel);
 
        status->flag |= RX_FLAG_TSFT;