File nm-madwifi-strength-rml.patch of Package NetworkManager

Overview Repositories Revisions Requests Users Attributes Meta

File nm-madwifi-strength-rml.patch of Package NetworkManager (Revision 88ee0d32f1d523401082f4da6c06c6f8)

Currently displaying revision 88ee0d32f1d523401082f4da6c06c6f8 , Show latest

Index: src/nm-device-802-11-wireless.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-11-wireless.c,v
retrieving revision 1.60.2.8
diff -u -r1.60.2.8 nm-device-802-11-wireless.c
--- src/nm-device-802-11-wireless.c	17 May 2006 14:57:05 -0000	1.60.2.8
+++ src/nm-device-802-11-wireless.c	17 May 2006 15:28:19 -0000
@@ -116,7 +116,8 @@
                                       guint8 **out_res_buf,
                                       guint32 *data_len);
 
-static int	wireless_qual_to_percent (const struct iw_quality *qual,
+static int	wireless_qual_to_percent (NMDevice *dev,
+								 const struct iw_quality *qual,
                                          const struct iw_quality *max_qual,
                                          const struct iw_quality *avg_qual);
 
@@ -244,8 +245,9 @@
 #endif
 		if (iw_get_stats (nm_dev_sock_get_fd (sk), iface, &stats, &range, has_range) == 0)
 		{
-			percent = wireless_qual_to_percent (&stats.qual, (const iwqual *)(&self->priv->max_qual),
-					(const iwqual *)(&self->priv->avg_qual));
+			percent = wireless_qual_to_percent (NM_DEVICE (self), &stats.qual,
+						(const iwqual *)(&self->priv->max_qual),
+  						(const iwqual *)(&self->priv->avg_qual));
 		}
 		nm_dev_sock_close (sk);
 	}
@@ -1148,7 +1150,8 @@
  *
  */
 static int
-wireless_qual_to_percent (const struct iw_quality *qual,
+wireless_qual_to_percent (NMDevice *dev,
+					 const struct iw_quality *qual,
                           const struct iw_quality *max_qual,
                           const struct iw_quality *avg_qual)
 {
@@ -1177,7 +1180,7 @@
 	 * are free to use whatever they want to calculate "Link Quality".
 	 */
 	if ((max_qual->qual != 0) && !(max_qual->updated & IW_QUAL_QUAL_INVALID) && !(qual->updated & IW_QUAL_QUAL_INVALID))
-		percent = (int)(100 * ((double)qual->qual / (double)max_qual->qual));
+		percent = (int) (100 * ((double) qual->qual / (double) max_qual->qual));
 
 	/* If the driver doesn't specify a complete and valid quality, we have two options:
 	 *
@@ -1243,7 +1246,7 @@
 	}
 
 	/* If the quality percent was 0 or doesn't exist, then try to use signal levels instead */
-	if ((percent < 1) && (level_percent >= 0))
+	if ((percent < 1 || !strcmp (nm_device_get_driver (dev), "ath_pci")) && (level_percent >= 0))
 		percent = level_percent;
 
 #ifdef IW_QUAL_DEBUG
@@ -3301,7 +3304,8 @@
 				nm_ap_set_freq (ap, iw_freq2float(&(iwe->u.freq)));
 				break;
 			case IWEVQUAL:
-				nm_ap_set_strength (ap, wireless_qual_to_percent (&(iwe->u.qual),
+				nm_ap_set_strength (ap, wireless_qual_to_percent (&dev->parent,
+									&(iwe->u.qual),
 									(const iwqual *)(&dev->priv->max_qual),
 									(const iwqual *)(&dev->priv->avg_qual)));
 				break;

Places

File nm-madwifi-strength-rml.patch of Package NetworkManager (Revision 88ee0d32f1d523401082f4da6c06c6f8)

Places