diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-16 21:25:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-16 21:25:48 -0400 |
| commit | caea902f72b053fd0c76d0d3b6b2e057beb3fc64 (patch) | |
| tree | 74e8d476b2c51480420e2ef7c9bbae249b6edbc9 /net/mac80211/wme.c | |
| parent | 0b4419162aa6c4204843f3a13b48d9ab821d3167 (diff) | |
| parent | 65c3e4715b1b934f8dcc002d9f46b4371ca7a9b1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/Kconfig
drivers/net/wireless/rt2x00/rt2x00usb.c
net/sctp/protocol.c
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 d8c2f9688b25..cfa8fbb0736a 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c | |||
| @@ -637,7 +637,7 @@ int ieee80211_ht_agg_queue_add(struct ieee80211_local *local, | |||
| 637 | #ifdef CONFIG_MAC80211_HT_DEBUG | 637 | #ifdef CONFIG_MAC80211_HT_DEBUG |
| 638 | if (net_ratelimit()) | 638 | if (net_ratelimit()) |
| 639 | printk(KERN_DEBUG "allocated aggregation queue" | 639 | printk(KERN_DEBUG "allocated aggregation queue" |
| 640 | " %d tid %d addr %s pool=0x%lX", | 640 | " %d tid %d addr %s pool=0x%lX\n", |
| 641 | i, tid, print_mac(mac, sta->addr), | 641 | i, tid, print_mac(mac, sta->addr), |
| 642 | q->qdisc_pool[0]); | 642 | q->qdisc_pool[0]); |
| 643 | #endif /* CONFIG_MAC80211_HT_DEBUG */ | 643 | #endif /* CONFIG_MAC80211_HT_DEBUG */ |