netdev: Move rest of qdisc state into struct netdev_queue
Now qdisc, qdisc_sleeping, and qdisc_list also live there. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -166,7 +166,8 @@ replay:
|
||||
|
||||
/* Find qdisc */
|
||||
if (!parent) {
|
||||
q = dev->qdisc_sleeping;
|
||||
struct netdev_queue *dev_queue = &dev->tx_queue;
|
||||
q = dev_queue->qdisc_sleeping;
|
||||
parent = q->handle;
|
||||
} else {
|
||||
q = qdisc_lookup(dev, TC_H_MAJ(t->tcm_parent));
|
||||
@@ -390,6 +391,7 @@ static int tcf_node_dump(struct tcf_proto *tp, unsigned long n,
|
||||
static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb)
|
||||
{
|
||||
struct net *net = sock_net(skb->sk);
|
||||
struct netdev_queue *dev_queue;
|
||||
int t;
|
||||
int s_t;
|
||||
struct net_device *dev;
|
||||
@@ -408,8 +410,9 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb)
|
||||
if ((dev = dev_get_by_index(&init_net, tcm->tcm_ifindex)) == NULL)
|
||||
return skb->len;
|
||||
|
||||
dev_queue = &dev->tx_queue;
|
||||
if (!tcm->tcm_parent)
|
||||
q = dev->qdisc_sleeping;
|
||||
q = dev_queue->qdisc_sleeping;
|
||||
else
|
||||
q = qdisc_lookup(dev, TC_H_MAJ(tcm->tcm_parent));
|
||||
if (!q)
|
||||
|
Reference in New Issue
Block a user