---

yaml --- r: 314869 b: refs/heads/master c: 08ce5ab h: refs/heads/master i: 314867: a6634bc v: v3
git-mirror · Jun 22, 2012 · f9c72dc · f9c72dc
1 parent 5a51370
commit f9c72dc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17efdc4ab8cc2ac959ca1a16c9ab04d8830c4bff
+refs/heads/master: 08ce5abe3d0e29a7c8b46c4bec891862941116d7
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
@@ -261,7 +261,7 @@ static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta,
 
 	memcpy(addr, sta->sta.addr, ETH_ALEN);
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
 	wiphy_debug(sdata->local->hw.wiphy,
 		    "Adding new IBSS station %pM (dev=%s)\n",
 		    addr, sdata->name);

diff --git a/trunk/net/mac80211/status.c b/trunk/net/mac80211/status.c
@@ -155,7 +155,7 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
 		return;
 	}
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
+#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
 	if (net_ratelimit())
 		wiphy_debug(local->hw.wiphy,
 			    "dropped TX filtered frame, queue_len=%d PS=%d @%lu\n",