Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6.git] / net / mac80211 / rx.c
index 04ea07f..e0c944f 100644 (file)
@@ -179,14 +179,6 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
                pos++;
        }
 
-       /* IEEE80211_RADIOTAP_DBM_ANTNOISE */
-       if (local->hw.flags & IEEE80211_HW_NOISE_DBM) {
-               *pos = status->noise;
-               rthdr->it_present |=
-                       cpu_to_le32(1 << IEEE80211_RADIOTAP_DBM_ANTNOISE);
-               pos++;
-       }
-
        /* IEEE80211_RADIOTAP_LOCK_QUALITY is missing */
 
        /* IEEE80211_RADIOTAP_ANTENNA */
@@ -1078,7 +1070,6 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx)
        sta->rx_fragments++;
        sta->rx_bytes += rx->skb->len;
        sta->last_signal = status->signal;
-       sta->last_noise = status->noise;
 
        /*
         * Change STA power saving mode only at the end of a frame