--- a/common.c
+++ b/common.c
@@ -387,11 +387,22 @@ u8 acx_rate111to100(u16 r)
 
 /***********************************************************************
 ** Calculate level like the feb 2003 windows driver seems to do
+*
+* Note: the FreeBSD and DragonFlyBSD drivers seems to use different
+* so-called correction constants depending on the chip. They will be
+* defined for now, but as it is still unknown whether they are correct
+* or not, only the original value will be used. Something else to take
+* into account is that the OpenBSD driver uses another approach and
+* defines the maximum RSSI value depending on the chip, rather than
+* using a value of 100 for all of them, as it is currently done here. 
 */
+#define ACX100_RSSI_CORR 8
+#define ACX111_RSSI_CORR 5
 static u8 acx_signal_to_winlevel(u8 rawlevel)
 {
 	/* u8 winlevel = (u8) (0.5 + 0.625 * rawlevel); */
-	u8 winlevel = ((4 + (rawlevel * 5)) / 8);
+	u8 winlevel = (((ACX100_RSSI_CORR / 2) + (rawlevel * 5)) /
+			ACX100_RSSI_CORR);
 
 	if (winlevel > 100)
 		winlevel = 100;
@@ -2143,9 +2154,10 @@ static int acx111_s_set_tx_level(acx_device_t * adev, u8 level_dbm)
 		adev->tx_level_dbm = 15;
 	}
 	if (level_dbm != adev->tx_level_dbm)
-		acx_log(LOG_WARNING, L_INIT, "acx111 firmware has specific "
-			"power levels only: adjusted %d dBm to %d dBm!\n",
-			level_dbm, adev->tx_level_dbm);
+		acx_log(LOG_WARNING, L_INIT, "only predefined transmission "
+				"power levels are supported at this time: "
+				"adjusted %d dBm to %d dBm\n", level_dbm,
+				adev->tx_level_dbm);
 
 	return acx_s_configure(adev, &tx_level, ACX1xx_REG_DOT11_TX_POWER_LEVEL);
 }
@@ -2344,7 +2356,8 @@ void acx_l_process_rxbuf(acx_device_t * adev, rxbuffer_t * rxbuf)
 	/* length of frame from control field to first byte of FCS */
 	buf_len = RXBUF_BYTES_RCVD(adev, rxbuf);
 
-	acx_log_dump(LOG_DEBUG, L_DATA, hdr, buf_len, "RX: 802.11 buffer:\n");
+	acx_log_dump(LOG_DEBUG, L_XFER | L_DATA, hdr, buf_len, 
+			"rx: 802.11 buffer:\n");
 
 	acx_l_rx(adev, rxbuf);
 	/* Now check Rx quality level, AFTER processing packet.
@@ -2354,14 +2367,8 @@ void acx_l_process_rxbuf(acx_device_t * adev, rxbuffer_t * rxbuf)
 	 * be expressed in dBm, or it's some pretty complicated
 	 * calculation. */
 
-#ifdef FROM_SCAN_SOURCE_ONLY
-	/* only consider packets originating from the MAC
-	 * address of the device that's managing our BSSID.
-	 * Disable it for now, since it removes information (levels
-	 * from different peers) and slows the Rx path. *//*
-	if (adev->ap_client && mac_is_equal(hdr->a2, adev->ap_client->address)) {
-*/
-#endif
+	/* TODO: only the RSSI seems to be reported */
+	adev->rx_status.ssi = acx_signal_to_winlevel(rxbuf->phy_level);
 
 	FN_EXIT0;
 }
@@ -2676,8 +2683,11 @@ static void acx_l_rx(acx_device_t * adev, rxbuffer_t * rxbuf)
 //	memset(&status, 0, sizeof(status));
 
 	status->mactime = rxbuf->time;
+	status->ssi = acx_signal_to_winlevel(rxbuf->phy_level);
+	/* TODO: they do not seem to be reported, at least on the acx111
+	 * (and TNETW1450?), therefore commenting them out 
 	status->signal = acx_signal_to_winlevel(rxbuf->phy_level);
-	status->noise = acx_signal_to_winlevel(rxbuf->phy_snr);
+	status->noise = acx_signal_to_winlevel(rxbuf->phy_snr); */
 	status->flag = 0;
 	status->rate = rxbuf->phy_plcp_signal;
 	status->antenna = 1;

--- a/pci.c
+++ b/pci.c
@@ -1485,6 +1485,23 @@ acxpci_e_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 			*/
 	ieee->queues = 1;
 
+	/* TODO: although in the original driver the maximum value was 100,
+	 * the OpenBSD driver assigns maximum values depending on the type of
+	 * radio transceiver (i.e. Radia, Maxim, etc.). This value is always a
+	 * positive integer which most probably indicates the gain of the AGC
+	 * in the rx path of the chip, in dB steps (0.625 dB, for example?).
+	 * The mapping of this rssi value to dBm is still unknown, but it can
+	 * nevertheless be used as a measure of relative signal strength. The
+	 * other two values, i.e. max_signal and max_noise, do not seem to be
+	 * supported on my acx111 card (they are always 0), although iwconfig
+	 * reports them (in dBm) when using ndiswrapper with the Windows XP
+	 * driver. The GPL-licensed part of the AVM FRITZ!WLAN USB Stick
+	 * driver sources (for the TNETW1450, though) seems to also indicate
+	 * that only the RSSI is supported. In conclusion, the max_signal and
+	 * max_noise values will not be initialised by now, as they do not
+	 * seem to be supported or how to acquire them is still unknown. */
+	ieee->max_rssi = 100;
+
 	adev = ieee2adev(ieee);
 
 	memset(adev, 0, sizeof(*adev));