diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:36:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:36:55 -0400 |
| commit | f6477cc76c73833a56e97f1fafc36a7ca92927e5 (patch) | |
| tree | 9b4ca3d9fa63ea001d516834c8b2707094f3f711 /net/mac80211/wme.c | |
| parent | fd2c17e1777d46cff14c25ea774a4d17459d188a (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/timers
Diffstat (limited to 'net/mac80211/wme.c')
| -rw-r--r-- | net/mac80211/wme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index dc1598b86004..635b996c8c35 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c | |||
| @@ -673,7 +673,7 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local, | |||
| 673 | #ifdef CONFIG_MAC80211_HT_DEBUG | 673 | #ifdef CONFIG_MAC80211_HT_DEBUG |
| 674 | if (net_ratelimit()) | 674 | if (net_ratelimit()) |
| 675 | printk(KERN_DEBUG "allocated aggregation queue" | 675 | printk(KERN_DEBUG "allocated aggregation queue" |
| 676 | " %d tid %d addr %s pool=0x%lX", | 676 | " %d tid %d addr %s pool=0x%lX\n", |
| 677 | i, tid, print_mac(mac, sta->addr), | 677 | i, tid, print_mac(mac, sta->addr), |
| 678 | q->qdisc_pool[0]); | 678 | q->qdisc_pool[0]); |
| 679 | #endif /* CONFIG_MAC80211_HT_DEBUG */ | 679 | #endif /* CONFIG_MAC80211_HT_DEBUG */ |