aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/iface.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-06-22 05:29:50 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-06-24 05:32:29 -0400
commitbdcbd8e0e3ffdad32b14b6373e67bfcf5fd3f002 (patch)
treeb636f2229570dc95edef997272bd0656cf19224d /net/mac80211/iface.c
parentd3b2fb53c7f82903880769d406c11c7e619b11a4 (diff)
mac80211: clean up debugging
There are a few things that make the logging and debugging in mac80211 less useful than it should be right now: * a lot of messages should be pr_info, not pr_debug * wholesale use of pr_debug makes it require *both* Kconfig and dynamic configuration * there are still a lot of ifdefs * the style is very inconsistent, sometimes the sdata->name is printed in front Clean up everything, introducing new macros and separating out the station MLME debugging into a new Kconfig symbol. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/iface.c')
-rw-r--r--net/mac80211/iface.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 728d3eac1f59..576880317d0e 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -57,9 +57,6 @@ static int ieee80211_change_mtu(struct net_device *dev, int new_mtu)
57 return -EINVAL; 57 return -EINVAL;
58 } 58 }
59 59
60#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
61 pr_debug("%s: setting MTU %d\n", dev->name, new_mtu);
62#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
63 dev->mtu = new_mtu; 60 dev->mtu = new_mtu;
64 return 0; 61 return 0;
65} 62}
@@ -1223,7 +1220,7 @@ static void ieee80211_assign_perm_addr(struct ieee80211_local *local,
1223 1220
1224 if (__ffs64(mask) + hweight64(mask) != fls64(mask)) { 1221 if (__ffs64(mask) + hweight64(mask) != fls64(mask)) {
1225 /* not a contiguous mask ... not handled now! */ 1222 /* not a contiguous mask ... not handled now! */
1226 pr_debug("not contiguous\n"); 1223 pr_info("not contiguous\n");
1227 break; 1224 break;
1228 } 1225 }
1229 1226
@@ -1414,10 +1411,6 @@ static u32 ieee80211_idle_off(struct ieee80211_local *local,
1414 if (!(local->hw.conf.flags & IEEE80211_CONF_IDLE)) 1411 if (!(local->hw.conf.flags & IEEE80211_CONF_IDLE))
1415 return 0; 1412 return 0;
1416 1413
1417#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
1418 wiphy_debug(local->hw.wiphy, "device no longer idle - %s\n", reason);
1419#endif
1420
1421 local->hw.conf.flags &= ~IEEE80211_CONF_IDLE; 1414 local->hw.conf.flags &= ~IEEE80211_CONF_IDLE;
1422 return IEEE80211_CONF_CHANGE_IDLE; 1415 return IEEE80211_CONF_CHANGE_IDLE;
1423} 1416}
@@ -1427,10 +1420,6 @@ static u32 ieee80211_idle_on(struct ieee80211_local *local)
1427 if (local->hw.conf.flags & IEEE80211_CONF_IDLE) 1420 if (local->hw.conf.flags & IEEE80211_CONF_IDLE)
1428 return 0; 1421 return 0;
1429 1422
1430#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
1431 wiphy_debug(local->hw.wiphy, "device now idle\n");
1432#endif
1433
1434 drv_flush(local, false); 1423 drv_flush(local, false);
1435 1424
1436 local->hw.conf.flags |= IEEE80211_CONF_IDLE; 1425 local->hw.conf.flags |= IEEE80211_CONF_IDLE;