From f636c5048d2cb35e3be04dd30c4410a4e846cc89 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 7 Apr 2010 12:31:29 -0700
Subject: [PATCH] wifi: update logging for APs

---
 src/nm-wifi-ap.c | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/nm-wifi-ap.c b/src/nm-wifi-ap.c
index f3365176ad..ba865cfbff 100644
--- a/src/nm-wifi-ap.c
+++ b/src/nm-wifi-ap.c
@@ -26,6 +26,7 @@
 #include "nm-wifi-ap.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
+#include "nm-logging.h"
 #include "nm-dbus-manager.h"
 #include "wpa.h"
 #include "nm-properties-changed-signal.h"
@@ -333,7 +334,7 @@ nm_ap_export_to_dbus (NMAccessPoint *ap)
 	priv = NM_AP_GET_PRIVATE (ap);
 
 	if (priv->dbus_path) {
-		nm_warning ("Tried to export AP %s twice.", priv->dbus_path);
+		nm_log_err (LOGD_CORE, "Tried to export AP %s twice.", priv->dbus_path);
 		return;
 	}
 
@@ -700,21 +701,21 @@ nm_ap_print_self (NMAccessPoint *ap,
 
 	priv = NM_AP_GET_PRIVATE (ap);
 
-	nm_info ("%s'%s' (%p) stamp=%ld flags=0x%X wpa-flags=0x%X rsn-flags=0x%x "
-	         "bssid=" MAC_FMT " strength=%d freq=%d rate=%d mode=%d seen=%ld",
-	         prefix,
-	         priv->ssid ? nm_utils_escape_ssid (priv->ssid->data, priv->ssid->len) : "(none)",
-	         ap,
-	         priv->timestamp.tv_sec,
-	         priv->flags,
-	         priv->wpa_flags,
-	         priv->rsn_flags,
-	         MAC_ARG (priv->address.ether_addr_octet),
-	         priv->strength,
-	         priv->freq,
-	         priv->max_bitrate,
-	         priv->mode,
-	         priv->last_seen);
+	nm_log_dbg (LOGD_WIFI_SCAN, "%s'%s' (%p) stamp=%ld flags=0x%X wpa-flags=0x%X rsn-flags=0x%x "
+	            "bssid=" MAC_FMT " strength=%d freq=%d rate=%d mode=%d seen=%ld",
+	            prefix,
+	            priv->ssid ? nm_utils_escape_ssid (priv->ssid->data, priv->ssid->len) : "(none)",
+	            ap,
+	            priv->timestamp.tv_sec,
+	            priv->flags,
+	            priv->wpa_flags,
+	            priv->rsn_flags,
+	            MAC_ARG (priv->address.ether_addr_octet),
+	            priv->strength,
+	            priv->freq,
+	            priv->max_bitrate,
+	            priv->mode,
+	            priv->last_seen);
 }
 
 const char *
@@ -940,7 +941,7 @@ void nm_ap_set_mode (NMAccessPoint *ap, const NM80211Mode mode)
 			g_object_notify (G_OBJECT (ap), NM_AP_MODE);
 		}
 	} else
-		nm_warning ("Invalid AP mode '%d'", mode);
+		nm_log_warn (LOGD_WIFI, "Invalid AP mode '%d'", mode);
 }