Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 64d4e3431e686dc37ce388ba531c4c4e866fb141

Authored by WANG Cong
Committed by David S. Miller
1 parent 8b4837c879

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>

Showing 9 changed files with 0 additions and 18 deletions Side-by-side Diff

include/linux/skbuff.h
Diff comments   View file @ 64d4e34
... ... @@ -1161,10 +1161,6 @@
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 {
net/bridge/br_forward.c
Diff comments   View file @ 64d4e34
... ... @@ -44,7 +44,6 @@
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) ||
... ... @@ -1597,7 +1597,6 @@
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  
... ... @@ -1650,7 +1649,6 @@
1650 1649 }
1651 1650  
1652 1651 skb->dev = dev;
1653   - skb_sender_cpu_clear(skb);
1654 1652 return dev_queue_xmit(skb);
1655 1653 }
1656 1654  
... ... @@ -4302,7 +4302,6 @@
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);
net/ipv4/ip_forward.c
Diff comments   View file @ 64d4e34
... ... @@ -71,7 +71,6 @@
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  
net/ipv6/ip6_output.c
Diff comments   View file @ 64d4e34
... ... @@ -332,7 +332,6 @@
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  
net/netfilter/ipvs/ip_vs_xmit.c
Diff comments   View file @ 64d4e34
... ... @@ -531,8 +531,6 @@
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 }
... ... @@ -573,8 +571,6 @@
573 571  
574 572 if (!local) {
575 573 skb_forward_csum(skb);
576   - if (!skb->sk)
577   - skb_sender_cpu_clear(skb);
578 574 NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb,
579 575 NULL, skb_dst(skb)->dev, dst_output);
580 576 } else
... ... @@ -595,8 +591,6 @@
595 591 if (!local) {
596 592 ip_vs_drop_early_demux_sk(skb);
597 593 skb_forward_csum(skb);
598   - if (!skb->sk)
599   - skb_sender_cpu_clear(skb);
600 594 NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb,
601 595 NULL, skb_dst(skb)->dev, dst_output);
602 596 } else
net/netfilter/nf_dup_netdev.c
Diff comments   View file @ 64d4e34
... ... @@ -31,7 +31,6 @@
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);
net/sched/act_mirred.c
Diff comments   View file @ 64d4e34
... ... @@ -182,7 +182,6 @@
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) {