From owner-svn-src-all@FreeBSD.ORG  Sun Jun 30 06:04:01 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 36A8184D;
 Sun, 30 Jun 2013 06:04:01 +0000 (UTC)
 (envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2831012F6;
 Sun, 30 Jun 2013 06:04:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5U641bD069905;
 Sun, 30 Jun 2013 06:04:01 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5U641cZ069904;
 Sun, 30 Jun 2013 06:04:01 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201306300604.r5U641cZ069904@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sun, 30 Jun 2013 06:04:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252405 - head/sys/dev/usb/wlan
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Jun 2013 06:04:01 -0000

Author: rpaulo
Date: Sun Jun 30 06:04:00 2013
New Revision: 252405
URL: http://svnweb.freebsd.org/changeset/base/252405

Log:
  Fix the RSSI calculation.

Modified:
  head/sys/dev/usb/wlan/if_urtwn.c

Modified: head/sys/dev/usb/wlan/if_urtwn.c
==============================================================================
--- head/sys/dev/usb/wlan/if_urtwn.c	Sun Jun 30 05:56:13 2013	(r252404)
+++ head/sys/dev/usb/wlan/if_urtwn.c	Sun Jun 30 06:04:00 2013	(r252405)
@@ -80,6 +80,7 @@ SYSCTL_INT(_hw_usb_urtwn, OID_AUTO, debu
     "Debug level");
 #endif
 
+#define	URTWN_RSSI((r))  (r) - 110
 #define	IEEE80211_HAS_ADDR4(wh)	\
 	(((wh)->i_fc[1] & IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS)
 
@@ -610,6 +611,11 @@ urtwn_rx_frame(struct urtwn_softc *sc, u
 		rssi = urtwn_get_rssi(sc, rate, &stat[1]);
 		/* Update our average RSSI. */
 		urtwn_update_avgrssi(sc, rate, rssi);
+		/*
+		 * Convert the RSSI to a range that will be accepted
+		 * by net80211.
+		 */
+		rssi = URTWN_RSSI(rssi);
 	}
 
 	m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);