aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_mqprio.c
diff options
context:
space:
mode:
authorJonathan Herman <hermanjl@cs.unc.edu>2013-01-17 16:15:55 -0500
committerJonathan Herman <hermanjl@cs.unc.edu>2013-01-17 16:15:55 -0500
commit8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
treea8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /net/sched/sch_mqprio.c
parent406089d01562f1e2bf9f089fd7637009ebaad589 (diff)
Patched in Tegra support.
Diffstat (limited to 'net/sched/sch_mqprio.c')
-rw-r--r--net/sched/sch_mqprio.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/net/sched/sch_mqprio.c b/net/sched/sch_mqprio.c
index accec33c454..59b26b8ff4b 100644
--- a/net/sched/sch_mqprio.c
+++ b/net/sched/sch_mqprio.c
@@ -14,7 +14,6 @@
14#include <linux/string.h> 14#include <linux/string.h>
15#include <linux/errno.h> 15#include <linux/errno.h>
16#include <linux/skbuff.h> 16#include <linux/skbuff.h>
17#include <linux/module.h>
18#include <net/netlink.h> 17#include <net/netlink.h>
19#include <net/pkt_sched.h> 18#include <net/pkt_sched.h>
20#include <net/sch_generic.h> 19#include <net/sch_generic.h>
@@ -132,7 +131,6 @@ static int mqprio_init(struct Qdisc *sch, struct nlattr *opt)
132 goto err; 131 goto err;
133 } 132 }
134 priv->qdiscs[i] = qdisc; 133 priv->qdiscs[i] = qdisc;
135 qdisc->flags |= TCQ_F_ONETXQUEUE;
136 } 134 }
137 135
138 /* If the mqprio options indicate that hardware should own 136 /* If the mqprio options indicate that hardware should own
@@ -206,9 +204,6 @@ static int mqprio_graft(struct Qdisc *sch, unsigned long cl, struct Qdisc *new,
206 204
207 *old = dev_graft_qdisc(dev_queue, new); 205 *old = dev_graft_qdisc(dev_queue, new);
208 206
209 if (new)
210 new->flags |= TCQ_F_ONETXQUEUE;
211
212 if (dev->flags & IFF_UP) 207 if (dev->flags & IFF_UP)
213 dev_activate(dev); 208 dev_activate(dev);
214 209
@@ -251,8 +246,7 @@ static int mqprio_dump(struct Qdisc *sch, struct sk_buff *skb)
251 opt.offset[i] = dev->tc_to_txq[i].offset; 246 opt.offset[i] = dev->tc_to_txq[i].offset;
252 } 247 }
253 248
254 if (nla_put(skb, TCA_OPTIONS, sizeof(opt), &opt)) 249 NLA_PUT(skb, TCA_OPTIONS, sizeof(opt), &opt);
255 goto nla_put_failure;
256 250
257 return skb->len; 251 return skb->len;
258nla_put_failure: 252nla_put_failure: