aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorWillem de Bruijn <willemb@google.com>2017-01-07 17:06:37 -0500
committerDavid S. Miller <davem@davemloft.net>2017-01-08 20:58:52 -0500
commit8dc07fdbf2054f157e8333f940a1ad728916c786 (patch)
tree57c9c5278fc96ac73f70b04c0895011c8faa820f /net/core/dev.c
parenta5135bcfba7345031df45e02cd150a45add47cf8 (diff)
net-tc: convert tc_at to tc_at_ingress
Field tc_at is used only within tc actions to distinguish ingress from egress processing. A single bit is sufficient for this purpose. Signed-off-by: Willem de Bruijn <willemb@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 8b5d6d033473..c143f1391117 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3153,9 +3153,7 @@ sch_handle_egress(struct sk_buff *skb, int *ret, struct net_device *dev)
3153 if (!cl) 3153 if (!cl)
3154 return skb; 3154 return skb;
3155 3155
3156 /* skb->tc_at and qdisc_skb_cb(skb)->pkt_len were already set 3156 /* qdisc_skb_cb(skb)->pkt_len was already set by the caller. */
3157 * earlier by the caller.
3158 */
3159 qdisc_bstats_cpu_update(cl->q, skb); 3157 qdisc_bstats_cpu_update(cl->q, skb);
3160 3158
3161 switch (tc_classify(skb, cl, &cl_res, false)) { 3159 switch (tc_classify(skb, cl, &cl_res, false)) {
@@ -3320,7 +3318,7 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv)
3320 3318
3321 qdisc_pkt_len_init(skb); 3319 qdisc_pkt_len_init(skb);
3322#ifdef CONFIG_NET_CLS_ACT 3320#ifdef CONFIG_NET_CLS_ACT
3323 skb->tc_at = AT_EGRESS; 3321 skb->tc_at_ingress = 0;
3324# ifdef CONFIG_NET_EGRESS 3322# ifdef CONFIG_NET_EGRESS
3325 if (static_key_false(&egress_needed)) { 3323 if (static_key_false(&egress_needed)) {
3326 skb = sch_handle_egress(skb, &rc, dev); 3324 skb = sch_handle_egress(skb, &rc, dev);
@@ -3920,7 +3918,7 @@ sch_handle_ingress(struct sk_buff *skb, struct packet_type **pt_prev, int *ret,
3920 } 3918 }
3921 3919
3922 qdisc_skb_cb(skb)->pkt_len = skb->len; 3920 qdisc_skb_cb(skb)->pkt_len = skb->len;
3923 skb->tc_at = AT_INGRESS; 3921 skb->tc_at_ingress = 1;
3924 qdisc_bstats_cpu_update(cl->q, skb); 3922 qdisc_bstats_cpu_update(cl->q, skb);
3925 3923
3926 switch (tc_classify(skb, cl, &cl_res, false)) { 3924 switch (tc_classify(skb, cl, &cl_res, false)) {