mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 21:33:52 +00:00
Code Issues Releases Wiki Activity

net: rename netdev rx_queue to ingress_queue

Browse source 
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>
This commit is contained in:
Eric Dumazet 2010-09-28 05:58:37 +00:00 committed by David S. Miller
parent 8560f2266b
commit bfa5ae63b8
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/netdevice.h
View file

@ -986,7 +986,7 @@ struct net_device {
rx_handler_func_t *rx_handler; rx_handler_func_t *rx_handler;
void *rx_handler_data; void *rx_handler_data;
struct netdev_queue rx_queue; /* use two cache lines */ struct netdev_queue ingress_queue; /* use two cache lines */
/* /*
* Cache lines mostly used on transmit path * Cache lines mostly used on transmit path

8
net/core/dev.c
View file

@ -2720,7 +2720,7 @@ static int ing_filter(struct sk_buff *skb)
skb->tc_verd = SET_TC_RTTL(skb->tc_verd, ttl); skb->tc_verd = SET_TC_RTTL(skb->tc_verd, ttl);
skb->tc_verd = SET_TC_AT(skb->tc_verd, AT_INGRESS); skb->tc_verd = SET_TC_AT(skb->tc_verd, AT_INGRESS);
rxq = &dev->rx_queue; rxq = &dev->ingress_queue;
q = rxq->qdisc; q = rxq->qdisc;
if (q != &noop_qdisc) { if (q != &noop_qdisc) {
@ -2737,7 +2737,7 @@ static inline struct sk_buff *handle_ing(struct sk_buff *skb,
struct packet_type **pt_prev, struct packet_type **pt_prev,
int *ret, struct net_device *orig_dev) int *ret, struct net_device *orig_dev)
{ {
if (skb->dev->rx_queue.qdisc == &noop_qdisc) if (skb->dev->ingress_queue.qdisc == &noop_qdisc)
goto out; goto out;
if (*pt_prev) { if (*pt_prev) {
@ -4940,7 +4940,7 @@ static void __netdev_init_queue_locks_one(struct net_device *dev,
static void netdev_init_queue_locks(struct net_device *dev) static void netdev_init_queue_locks(struct net_device *dev)
{ {
netdev_for_each_tx_queue(dev, __netdev_init_queue_locks_one, NULL); netdev_for_each_tx_queue(dev, __netdev_init_queue_locks_one, NULL);
__netdev_init_queue_locks_one(dev, &dev->rx_queue, NULL); __netdev_init_queue_locks_one(dev, &dev->ingress_queue, NULL);
} }
unsigned long netdev_fix_features(unsigned long features, const char *name) unsigned long netdev_fix_features(unsigned long features, const char *name)
@ -5452,7 +5452,7 @@ static void netdev_init_one_queue(struct net_device *dev,
static void netdev_init_queues(struct net_device *dev) static void netdev_init_queues(struct net_device *dev)
{ {
netdev_init_one_queue(dev, &dev->rx_queue, NULL); netdev_init_one_queue(dev, &dev->ingress_queue, NULL);
netdev_for_each_tx_queue(dev, netdev_init_one_queue, NULL); netdev_for_each_tx_queue(dev, netdev_init_one_queue, NULL);
spin_lock_init(&dev->tx_global_lock); spin_lock_init(&dev->tx_global_lock);
} }

14
net/sched/sch_api.c
View file

@ -240,7 +240,7 @@ struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle)
if (q) if (q)
goto out; goto out;
q = qdisc_match_from_root(dev->rx_queue.qdisc_sleeping, handle); q = qdisc_match_from_root(dev->ingress_queue.qdisc_sleeping, handle);
out: out:
return q; return q;
} }
@ -701,7 +701,7 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
} }
for (i = 0; i < num_q; i++) { for (i = 0; i < num_q; i++) {
struct netdev_queue *dev_queue = &dev->rx_queue; struct netdev_queue *dev_queue = &dev->ingress_queue;
if (!ingress) if (!ingress)
dev_queue = netdev_get_tx_queue(dev, i); 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)
return -ENOENT; return -ENOENT;
q = qdisc_leaf(p, clid); q = qdisc_leaf(p, clid);
} else { /* ingress */ } else { /* ingress */
q = dev->rx_queue.qdisc_sleeping; q = dev->ingress_queue.qdisc_sleeping;
} }
} else { } else {
q = dev->qdisc; q = dev->qdisc;
@ -1044,7 +1044,7 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
return -ENOENT; return -ENOENT;
q = qdisc_leaf(p, clid); q = qdisc_leaf(p, clid);
} else { /*ingress */ } else { /*ingress */
q = dev->rx_queue.qdisc_sleeping; q = dev->ingress_queue.qdisc_sleeping;
} }
} else { } else {
q = dev->qdisc; q = dev->qdisc;
@ -1124,7 +1124,7 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
if (!(n->nlmsg_flags&NLM_F_CREATE)) if (!(n->nlmsg_flags&NLM_F_CREATE))
return -ENOENT; return -ENOENT;
if (clid == TC_H_INGRESS) if (clid == TC_H_INGRESS)
q = qdisc_create(dev, &dev->rx_queue, p, q = qdisc_create(dev, &dev->ingress_queue, p,
tcm->tcm_parent, tcm->tcm_parent, tcm->tcm_parent, tcm->tcm_parent,
tca, &err); tca, &err);
else { else {
@ -1304,7 +1304,7 @@ static int tc_dump_qdisc(struct sk_buff *skb, struct netlink_callback *cb)
if (tc_dump_qdisc_root(dev->qdisc, skb, cb, &q_idx, s_q_idx) < 0) if (tc_dump_qdisc_root(dev->qdisc, skb, cb, &q_idx, s_q_idx) < 0)
goto done; goto done;
dev_queue = &dev->rx_queue; dev_queue = &dev->ingress_queue;
if (tc_dump_qdisc_root(dev_queue->qdisc_sleeping, skb, cb, &q_idx, s_q_idx) < 0) if (tc_dump_qdisc_root(dev_queue->qdisc_sleeping, skb, cb, &q_idx, s_q_idx) < 0)
goto done; goto done;
@ -1595,7 +1595,7 @@ static int tc_dump_tclass(struct sk_buff *skb, struct netlink_callback *cb)
if (tc_dump_tclass_root(dev->qdisc, skb, tcm, cb, &t, s_t) < 0) if (tc_dump_tclass_root(dev->qdisc, skb, tcm, cb, &t, s_t) < 0)
goto done; goto done;
dev_queue = &dev->rx_queue; dev_queue = &dev->ingress_queue;
if (tc_dump_tclass_root(dev_queue->qdisc_sleeping, skb, tcm, cb, &t, s_t) < 0) if (tc_dump_tclass_root(dev_queue->qdisc_sleeping, skb, tcm, cb, &t, s_t) < 0)
goto done; goto done;

8
net/sched/sch_generic.c
View file

@ -753,7 +753,7 @@ void dev_activate(struct net_device *dev)
need_watchdog = 0; need_watchdog = 0;
netdev_for_each_tx_queue(dev, transition_one_qdisc, &need_watchdog); netdev_for_each_tx_queue(dev, transition_one_qdisc, &need_watchdog);
transition_one_qdisc(dev, &dev->rx_queue, NULL); transition_one_qdisc(dev, &dev->ingress_queue, NULL);
if (need_watchdog) { if (need_watchdog) {
dev->trans_start = jiffies; dev->trans_start = jiffies;
@ -812,7 +812,7 @@ static bool some_qdisc_is_busy(struct net_device *dev)
void dev_deactivate(struct net_device *dev) void dev_deactivate(struct net_device *dev)
{ {
netdev_for_each_tx_queue(dev, dev_deactivate_queue, &noop_qdisc); netdev_for_each_tx_queue(dev, dev_deactivate_queue, &noop_qdisc);
dev_deactivate_queue(dev, &dev->rx_queue, &noop_qdisc); dev_deactivate_queue(dev, &dev->ingress_queue, &noop_qdisc);
dev_watchdog_down(dev); dev_watchdog_down(dev);
@ -838,7 +838,7 @@ void dev_init_scheduler(struct net_device *dev)
{ {
dev->qdisc = &noop_qdisc; dev->qdisc = &noop_qdisc;
netdev_for_each_tx_queue(dev, dev_init_scheduler_queue, &noop_qdisc); netdev_for_each_tx_queue(dev, dev_init_scheduler_queue, &noop_qdisc);
dev_init_scheduler_queue(dev, &dev->rx_queue, &noop_qdisc); dev_init_scheduler_queue(dev, &dev->ingress_queue, &noop_qdisc);
setup_timer(&dev->watchdog_timer, dev_watchdog, (unsigned long)dev); setup_timer(&dev->watchdog_timer, dev_watchdog, (unsigned long)dev);
} }
@ -861,7 +861,7 @@ static void shutdown_scheduler_queue(struct net_device *dev,
void dev_shutdown(struct net_device *dev) void dev_shutdown(struct net_device *dev)
{ {
netdev_for_each_tx_queue(dev, shutdown_scheduler_queue, &noop_qdisc); netdev_for_each_tx_queue(dev, shutdown_scheduler_queue, &noop_qdisc);
shutdown_scheduler_queue(dev, &dev->rx_queue, &noop_qdisc); shutdown_scheduler_queue(dev, &dev->ingress_queue, &noop_qdisc);
qdisc_destroy(dev->qdisc); qdisc_destroy(dev->qdisc);
dev->qdisc = &noop_qdisc; dev->qdisc = &noop_qdisc;