diff --git a/[refs] b/[refs] index 2c730104600a..c9e5b644d91e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77c06c2cb44fe68295efdd33939153c7d56de004 +refs/heads/master: 79027596ff710f9662ccae5f5e85de43961420ed diff --git a/trunk/net/mac80211/sta_info.c b/trunk/net/mac80211/sta_info.c index 31cd6d92531c..4034ee616022 100644 --- a/trunk/net/mac80211/sta_info.c +++ b/trunk/net/mac80211/sta_info.c @@ -1379,8 +1379,10 @@ int sta_info_move_state(struct sta_info *sta, return -EINVAL; } +#ifdef CONFIG_MAC80211_VERBOSE_DEBUG printk(KERN_DEBUG "%s: moving STA %pM to state %d\n", sta->sdata->name, sta->sta.addr, new_state); +#endif /* * notify the driver before the actual changes so it can