Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: remove skb_sender_cpu_clear()

After commit 52bd2d62ce67 ("net: better skb->sender_cpu and skb->napi_id cohabitation")
skb_sender_cpu_clear() becomes empty and can be removed.

Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

WANG Cong and committed by
David S. Miller
64d4e343 8b4837c8

-18
-4
include/linux/skbuff.h
··· 1161 1161 to->l4_hash = from->l4_hash; 1162 1162 }; 1163 1163 1164 - static inline void skb_sender_cpu_clear(struct sk_buff *skb) 1165 - { 1166 - } 1167 - 1168 1164 #ifdef NET_SKBUFF_DATA_USES_OFFSET 1169 1165 static inline unsigned char *skb_end_pointer(const struct sk_buff *skb) 1170 1166 {
-1
net/bridge/br_forward.c
··· 44 44 45 45 skb_push(skb, ETH_HLEN); 46 46 br_drop_fake_rtable(skb); 47 - skb_sender_cpu_clear(skb); 48 47 49 48 if (skb->ip_summed == CHECKSUM_PARTIAL && 50 49 (skb->protocol == htons(ETH_P_8021Q) ||
-2
net/core/filter.c
··· 1597 1597 } 1598 1598 1599 1599 skb2->dev = dev; 1600 - skb_sender_cpu_clear(skb2); 1601 1600 return dev_queue_xmit(skb2); 1602 1601 } 1603 1602 ··· 1649 1650 } 1650 1651 1651 1652 skb->dev = dev; 1652 - skb_sender_cpu_clear(skb); 1653 1653 return dev_queue_xmit(skb); 1654 1654 } 1655 1655
-1
net/core/skbuff.c
··· 4302 4302 skb->skb_iif = 0; 4303 4303 skb->ignore_df = 0; 4304 4304 skb_dst_drop(skb); 4305 - skb_sender_cpu_clear(skb); 4306 4305 secpath_reset(skb); 4307 4306 nf_reset(skb); 4308 4307 nf_reset_trace(skb);
-1
net/ipv4/ip_forward.c
··· 71 71 if (unlikely(opt->optlen)) 72 72 ip_forward_options(skb); 73 73 74 - skb_sender_cpu_clear(skb); 75 74 return dst_output(net, sk, skb); 76 75 } 77 76
-1
net/ipv6/ip6_output.c
··· 332 332 static inline int ip6_forward_finish(struct net *net, struct sock *sk, 333 333 struct sk_buff *skb) 334 334 { 335 - skb_sender_cpu_clear(skb); 336 335 return dst_output(net, sk, skb); 337 336 } 338 337
-6
net/netfilter/ipvs/ip_vs_xmit.c
··· 531 531 if (ret == NF_ACCEPT) { 532 532 nf_reset(skb); 533 533 skb_forward_csum(skb); 534 - if (!skb->sk) 535 - skb_sender_cpu_clear(skb); 536 534 } 537 535 return ret; 538 536 } ··· 571 573 572 574 if (!local) { 573 575 skb_forward_csum(skb); 574 - if (!skb->sk) 575 - skb_sender_cpu_clear(skb); 576 576 NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb, 577 577 NULL, skb_dst(skb)->dev, dst_output); 578 578 } else ··· 591 595 if (!local) { 592 596 ip_vs_drop_early_demux_sk(skb); 593 597 skb_forward_csum(skb); 594 - if (!skb->sk) 595 - skb_sender_cpu_clear(skb); 596 598 NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb, 597 599 NULL, skb_dst(skb)->dev, dst_output); 598 600 } else
-1
net/netfilter/nf_dup_netdev.c
··· 31 31 skb_push(skb, skb->mac_len); 32 32 33 33 skb->dev = dev; 34 - skb_sender_cpu_clear(skb); 35 34 dev_queue_xmit(skb); 36 35 } 37 36 EXPORT_SYMBOL_GPL(nf_dup_netdev_egress);
-1
net/sched/act_mirred.c
··· 182 182 183 183 skb2->skb_iif = skb->dev->ifindex; 184 184 skb2->dev = dev; 185 - skb_sender_cpu_clear(skb2); 186 185 err = dev_queue_xmit(skb2); 187 186 188 187 if (err) {