diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-15 03:34:44 -0400 |
| commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
| tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /net/mac80211/wme.c | |
| parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
| parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
Diffstat (limited to 'net/mac80211/wme.c')
| -rw-r--r-- | net/mac80211/wme.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index 8ffff27fe000..c87baf4ce979 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c | |||
| @@ -379,7 +379,8 @@ static int wme_qdiscop_init(struct Qdisc *qd, struct nlattr *opt) | |||
| 379 | qd->handle); | 379 | qd->handle); |
| 380 | if (!q->queues[i]) { | 380 | if (!q->queues[i]) { |
| 381 | q->queues[i] = &noop_qdisc; | 381 | q->queues[i] = &noop_qdisc; |
| 382 | printk(KERN_ERR "%s child qdisc %i creation failed", dev->name, i); | 382 | printk(KERN_ERR "%s child qdisc %i creation failed\n", |
| 383 | dev->name, i); | ||
| 383 | } | 384 | } |
| 384 | } | 385 | } |
| 385 | 386 | ||