Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / net / sched / sch_multiq.c

diff --git a/net/sched/sch_multiq.c b/net/sched/sch_multiq.c
index 7e151861794b5eb09eb7eb448834fc7be9fec3bc..9127312030472a5bf86c3e29a86c0aa44c0116f5 100644 (file)
--- a/net/sched/sch_multiq.c
+++ b/net/sched/sch_multiq.c
@@ -202,7 +202,7 @@ static int multiq_tune(struct Qdisc *sch, struct nlattr *opt)
        int i;
 
        if (!netif_is_multiqueue(qdisc_dev(sch)))
-               return -EINVAL;
+               return -EOPNOTSUPP;
        if (nla_len(opt) < sizeof(*qopt))
                return -EINVAL;