diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-29 20:16:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-29 20:16:50 -0400 |
| commit | e9a4b6a3f6592862a67837e80aad3f50468857a6 (patch) | |
| tree | 087420cf91ac922c7e99757c4490a605ec7b10f2 /net/mac80211/wme.c | |
| parent | 441dbb500b4344a8e3125e5aabab4f9dbf72514f (diff) | |
| parent | 1702b52092e9a6d05398d3f9581ddc050ef00d06 (diff) | |
Merge branch 'linux-2.6'
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 */ |