diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-09-28 01:58:37 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-29 16:25:53 -0400 |
commit | bfa5ae63b823f4ffd3483a05f60a93a4a7b7d680 (patch) | |
tree | 62dc495022ac697d81c3b80f5a262713e6f657a3 /net/sched | |
parent | 8560f2266b36adb43238f1f9fd13958dd031901c (diff) |
net: rename netdev rx_queue to ingress_queue
There is some confusion with rx_queue name after RPS, and net drivers
private rx_queue fields.
I suggest to rename "struct net_device"->rx_queue to ingress_queue.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/sch_api.c | 14 | ||||
-rw-r--r-- | net/sched/sch_generic.c | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 6fb3d41c0e41..b8020784d0e9 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
@@ -240,7 +240,7 @@ struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle) | |||
240 | if (q) | 240 | if (q) |
241 | goto out; | 241 | goto out; |
242 | 242 | ||
243 | q = qdisc_match_from_root(dev->rx_queue.qdisc_sleeping, handle); | 243 | q = qdisc_match_from_root(dev->ingress_queue.qdisc_sleeping, handle); |
244 | out: | 244 | out: |
245 | return q; | 245 | return q; |
246 | } | 246 | } |
@@ -701,7 +701,7 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent, | |||
701 | } | 701 | } |
702 | 702 | ||
703 | for (i = 0; i < num_q; i++) { | 703 | for (i = 0; i < num_q; i++) { |
704 | struct netdev_queue *dev_queue = &dev->rx_queue; | 704 | struct netdev_queue *dev_queue = &dev->ingress_queue; |
705 | 705 | ||
706 | if (!ingress) | 706 | if (!ingress) |
707 | dev_queue = netdev_get_tx_queue(dev, i); | 707 | dev_queue = netdev_get_tx_queue(dev, i); |
@@ -979,7 +979,7 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg) | |||
979 | return -ENOENT; | 979 | return -ENOENT; |
980 | q = qdisc_leaf(p, clid); | 980 | q = qdisc_leaf(p, clid); |
981 | } else { /* ingress */ | 981 | } else { /* ingress */ |
982 | q = dev->rx_queue.qdisc_sleeping; | 982 | q = dev->ingress_queue.qdisc_sleeping; |
983 | } | 983 | } |
984 | } else { | 984 | } else { |
985 | q = dev->qdisc; | 985 | q = dev->qdisc; |
@@ -1044,7 +1044,7 @@ replay: | |||
1044 | return -ENOENT; | 1044 | return -ENOENT; |
1045 | q = qdisc_leaf(p, clid); | 1045 | q = qdisc_leaf(p, clid); |
1046 | } else { /*ingress */ | 1046 | } else { /*ingress */ |
1047 | q = dev->rx_queue.qdisc_sleeping; | 1047 | q = dev->ingress_queue.qdisc_sleeping; |
1048 | } | 1048 | } |
1049 | } else { | 1049 | } else { |
1050 | q = dev->qdisc; | 1050 | q = dev->qdisc; |
@@ -1124,7 +1124,7 @@ create_n_graft: | |||
1124 | if (!(n->nlmsg_flags&NLM_F_CREATE)) | 1124 | if (!(n->nlmsg_flags&NLM_F_CREATE)) |
1125 | return -ENOENT; | 1125 | return -ENOENT; |
1126 | if (clid == TC_H_INGRESS) | 1126 | if (clid == TC_H_INGRESS) |
1127 | q = qdisc_create(dev, &dev->rx_queue, p, | 1127 | q = qdisc_create(dev, &dev->ingress_queue, p, |
1128 | tcm->tcm_parent, tcm->tcm_parent, | 1128 | tcm->tcm_parent, tcm->tcm_parent, |
1129 | tca, &err); | 1129 | tca, &err); |
1130 | else { | 1130 | else { |
@@ -1304,7 +1304,7 @@ static int tc_dump_qdisc(struct sk_buff *skb, struct netlink_callback *cb) | |||
1304 | if (tc_dump_qdisc_root(dev->qdisc, skb, cb, &q_idx, s_q_idx) < 0) | 1304 | if (tc_dump_qdisc_root(dev->qdisc, skb, cb, &q_idx, s_q_idx) < 0) |
1305 | goto done; | 1305 | goto done; |
1306 | 1306 | ||
1307 | dev_queue = &dev->rx_queue; | 1307 | dev_queue = &dev->ingress_queue; |
1308 | if (tc_dump_qdisc_root(dev_queue->qdisc_sleeping, skb, cb, &q_idx, s_q_idx) < 0) | 1308 | if (tc_dump_qdisc_root(dev_queue->qdisc_sleeping, skb, cb, &q_idx, s_q_idx) < 0) |
1309 | goto done; | 1309 | goto done; |
1310 | 1310 | ||
@@ -1595,7 +1595,7 @@ static int tc_dump_tclass(struct sk_buff *skb, struct netlink_callback *cb) | |||
1595 | if (tc_dump_tclass_root(dev->qdisc, skb, tcm, cb, &t, s_t) < 0) | 1595 | if (tc_dump_tclass_root(dev->qdisc, skb, tcm, cb, &t, s_t) < 0) |
1596 | goto done; | 1596 | goto done; |
1597 | 1597 | ||
1598 | dev_queue = &dev->rx_queue; | 1598 | dev_queue = &dev->ingress_queue; |
1599 | if (tc_dump_tclass_root(dev_queue->qdisc_sleeping, skb, tcm, cb, &t, s_t) < 0) | 1599 | if (tc_dump_tclass_root(dev_queue->qdisc_sleeping, skb, tcm, cb, &t, s_t) < 0) |
1600 | goto done; | 1600 | goto done; |
1601 | 1601 | ||
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 2aeb3a4386a1..545278a1c478 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
@@ -753,7 +753,7 @@ void dev_activate(struct net_device *dev) | |||
753 | 753 | ||
754 | need_watchdog = 0; | 754 | need_watchdog = 0; |
755 | netdev_for_each_tx_queue(dev, transition_one_qdisc, &need_watchdog); | 755 | netdev_for_each_tx_queue(dev, transition_one_qdisc, &need_watchdog); |
756 | transition_one_qdisc(dev, &dev->rx_queue, NULL); | 756 | transition_one_qdisc(dev, &dev->ingress_queue, NULL); |
757 | 757 | ||
758 | if (need_watchdog) { | 758 | if (need_watchdog) { |
759 | dev->trans_start = jiffies; | 759 | dev->trans_start = jiffies; |
@@ -812,7 +812,7 @@ static bool some_qdisc_is_busy(struct net_device *dev) | |||
812 | void dev_deactivate(struct net_device *dev) | 812 | void dev_deactivate(struct net_device *dev) |
813 | { | 813 | { |
814 | netdev_for_each_tx_queue(dev, dev_deactivate_queue, &noop_qdisc); | 814 | netdev_for_each_tx_queue(dev, dev_deactivate_queue, &noop_qdisc); |
815 | dev_deactivate_queue(dev, &dev->rx_queue, &noop_qdisc); | 815 | dev_deactivate_queue(dev, &dev->ingress_queue, &noop_qdisc); |
816 | 816 | ||
817 | dev_watchdog_down(dev); | 817 | dev_watchdog_down(dev); |
818 | 818 | ||
@@ -838,7 +838,7 @@ void dev_init_scheduler(struct net_device *dev) | |||
838 | { | 838 | { |
839 | dev->qdisc = &noop_qdisc; | 839 | dev->qdisc = &noop_qdisc; |
840 | netdev_for_each_tx_queue(dev, dev_init_scheduler_queue, &noop_qdisc); | 840 | netdev_for_each_tx_queue(dev, dev_init_scheduler_queue, &noop_qdisc); |
841 | dev_init_scheduler_queue(dev, &dev->rx_queue, &noop_qdisc); | 841 | dev_init_scheduler_queue(dev, &dev->ingress_queue, &noop_qdisc); |
842 | 842 | ||
843 | setup_timer(&dev->watchdog_timer, dev_watchdog, (unsigned long)dev); | 843 | setup_timer(&dev->watchdog_timer, dev_watchdog, (unsigned long)dev); |
844 | } | 844 | } |
@@ -861,7 +861,7 @@ static void shutdown_scheduler_queue(struct net_device *dev, | |||
861 | void dev_shutdown(struct net_device *dev) | 861 | void dev_shutdown(struct net_device *dev) |
862 | { | 862 | { |
863 | netdev_for_each_tx_queue(dev, shutdown_scheduler_queue, &noop_qdisc); | 863 | netdev_for_each_tx_queue(dev, shutdown_scheduler_queue, &noop_qdisc); |
864 | shutdown_scheduler_queue(dev, &dev->rx_queue, &noop_qdisc); | 864 | shutdown_scheduler_queue(dev, &dev->ingress_queue, &noop_qdisc); |
865 | qdisc_destroy(dev->qdisc); | 865 | qdisc_destroy(dev->qdisc); |
866 | dev->qdisc = &noop_qdisc; | 866 | dev->qdisc = &noop_qdisc; |
867 | 867 | ||