rtl8187: Remove deprecated 'qual' from returned RX status

The qual member of ieee80211_rx_status is deprecated. As a result, this
driver no longer needs to calculate a quality value.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Acked-by: Hin-Tak Leung <htl10@users.sourceforge.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rtl818x/rtl8187.h b/drivers/net/wireless/rtl818x/rtl8187.h
index bf9175a8c1f4d2dbd9d90d40ed23a5ced00adf90..abb4907cf2960925feeaec25a146b13e7d28e5e2 100644 (file)
--- a/drivers/net/wireless/rtl818x/rtl8187.h
+++ b/drivers/net/wireless/rtl818x/rtl8187.h
@@ -119,7 +119,6 @@ struct rtl8187_priv {
        } hw_rev;
        struct sk_buff_head rx_queue;
        u8 signal;
-       u8 quality;
        u8 noise;
        u8 slot_time;
        u8 aifsn[4];

diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
index 2017ccc001456b66fb539afd767892659f1b745b..76973b8c7099554f9a0e0bbef6fd3d6032d3321c 100644 (file)
--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
@@ -320,7 +320,6 @@ static void rtl8187_rx_cb(struct urb *urb)
        struct ieee80211_rx_status rx_status = { 0 };
        int rate, signal;
        u32 flags;
-       u32 quality;
        unsigned long f;
 
        spin_lock_irqsave(&priv->rx_queue.lock, f);
@@ -338,10 +337,9 @@ static void rtl8187_rx_cb(struct urb *urb)
                        (typeof(hdr))(skb_tail_pointer(skb) - sizeof(*hdr));
                flags = le32_to_cpu(hdr->flags);
                /* As with the RTL8187B below, the AGC is used to calculate
-                * signal strength and quality. In this case, the scaling
+                * signal strength. In this case, the scaling
                 * constants are derived from the output of p54usb.
                 */
-               quality = 130 - ((41 * hdr->agc) >> 6);
                signal = -4 - ((27 * hdr->agc) >> 6);
                rx_status.antenna = (hdr->signal >> 7) & 1;
                rx_status.mactime = le64_to_cpu(hdr->mac_time);
@@ -354,23 +352,18 @@ static void rtl8187_rx_cb(struct urb *urb)
                 * In testing, none of these quantities show qualitative
                 * agreement with AP signal strength, except for the AGC,
                 * which is inversely proportional to the strength of the
-                * signal. In the following, the quality and signal strength
-                * are derived from the AGC. The arbitrary scaling constants
+                * signal. In the following, the signal strength
+                * is derived from the AGC. The arbitrary scaling constants
                 * are chosen to make the results close to the values obtained
                 * for a BCM4312 using b43 as the driver. The noise is ignored
                 * for now.
                 */
                flags = le32_to_cpu(hdr->flags);
-               quality = 170 - hdr->agc;
                signal = 14 - hdr->agc / 2;
                rx_status.antenna = (hdr->rssi >> 7) & 1;
                rx_status.mactime = le64_to_cpu(hdr->mac_time);
        }
 
-       if (quality > 100)
-               quality = 100;
-       rx_status.qual = quality;
-       priv->quality = quality;
        rx_status.signal = signal;
        priv->signal = signal;
        rate = (flags >> 20) & 0xF;