diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-12-23 16:09:58 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-12-23 16:09:58 -0800 |
| commit | 8b3f91332291fa280a56215f5189baca185998f5 (patch) | |
| tree | b89f58972c80ffacf57c4c9cedb5b4b03473c5be /net/core/dev.c | |
| parent | f2b551fad8d8f2ac5e1f810ad595298381e0b0c5 (diff) | |
| parent | 391e5975c0208ce3739587b33eba08be3e473d79 (diff) | |
| download | linux-8b3f91332291fa280a56215f5189baca185998f5.tar.gz linux-8b3f91332291fa280a56215f5189baca185998f5.tar.bz2 linux-8b3f91332291fa280a56215f5189baca185998f5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
include/net/sock.h
commit 8f905c0e7354 ("inet: fully convert sk->sk_rx_dst to RCU rules")
commit 43f51df41729 ("net: move early demux fields close to sk_refcnt")
https://lore.kernel.org/all/20211222141641.0caa0ab3@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index a855e41bbe39..644b9c8be3a8 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3828,8 +3828,8 @@ sch_handle_egress(struct sk_buff *skb, int *ret, struct net_device *dev) return skb; /* qdisc_skb_cb(skb)->pkt_len was already set by the caller. */ - qdisc_skb_cb(skb)->mru = 0; - qdisc_skb_cb(skb)->post_ct = false; + tc_skb_cb(skb)->mru = 0; + tc_skb_cb(skb)->post_ct = false; mini_qdisc_bstats_cpu_update(miniq, skb); switch (tcf_classify(skb, miniq->block, miniq->filter_list, &cl_res, false)) { @@ -4988,8 +4988,8 @@ sch_handle_ingress(struct sk_buff *skb, struct packet_type **pt_prev, int *ret, } qdisc_skb_cb(skb)->pkt_len = skb->len; - qdisc_skb_cb(skb)->mru = 0; - qdisc_skb_cb(skb)->post_ct = false; + tc_skb_cb(skb)->mru = 0; + tc_skb_cb(skb)->post_ct = false; skb->tc_at_ingress = 1; mini_qdisc_bstats_cpu_update(miniq, skb); |