Browse Source

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>
WANG Cong 9 years ago
parent
commit
64d4e3431e

+ 0 - 4
include/linux/skbuff.h

@@ -1161,10 +1161,6 @@ static inline void skb_copy_hash(struct sk_buff *to, const struct sk_buff *from)
 	to->l4_hash = from->l4_hash;
 	to->l4_hash = from->l4_hash;
 };
 };
 
 
-static inline void skb_sender_cpu_clear(struct sk_buff *skb)
-{
-}
-
 #ifdef NET_SKBUFF_DATA_USES_OFFSET
 #ifdef NET_SKBUFF_DATA_USES_OFFSET
 static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
 static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
 {
 {

+ 0 - 1
net/bridge/br_forward.c

@@ -44,7 +44,6 @@ int br_dev_queue_push_xmit(struct net *net, struct sock *sk, struct sk_buff *skb
 
 
 	skb_push(skb, ETH_HLEN);
 	skb_push(skb, ETH_HLEN);
 	br_drop_fake_rtable(skb);
 	br_drop_fake_rtable(skb);
-	skb_sender_cpu_clear(skb);
 
 
 	if (skb->ip_summed == CHECKSUM_PARTIAL &&
 	if (skb->ip_summed == CHECKSUM_PARTIAL &&
 	    (skb->protocol == htons(ETH_P_8021Q) ||
 	    (skb->protocol == htons(ETH_P_8021Q) ||

+ 0 - 2
net/core/filter.c

@@ -1597,7 +1597,6 @@ static u64 bpf_clone_redirect(u64 r1, u64 ifindex, u64 flags, u64 r4, u64 r5)
 	}
 	}
 
 
 	skb2->dev = dev;
 	skb2->dev = dev;
-	skb_sender_cpu_clear(skb2);
 	return dev_queue_xmit(skb2);
 	return dev_queue_xmit(skb2);
 }
 }
 
 
@@ -1650,7 +1649,6 @@ int skb_do_redirect(struct sk_buff *skb)
 	}
 	}
 
 
 	skb->dev = dev;
 	skb->dev = dev;
-	skb_sender_cpu_clear(skb);
 	return dev_queue_xmit(skb);
 	return dev_queue_xmit(skb);
 }
 }
 
 

+ 0 - 1
net/core/skbuff.c

@@ -4302,7 +4302,6 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet)
 	skb->skb_iif = 0;
 	skb->skb_iif = 0;
 	skb->ignore_df = 0;
 	skb->ignore_df = 0;
 	skb_dst_drop(skb);
 	skb_dst_drop(skb);
-	skb_sender_cpu_clear(skb);
 	secpath_reset(skb);
 	secpath_reset(skb);
 	nf_reset(skb);
 	nf_reset(skb);
 	nf_reset_trace(skb);
 	nf_reset_trace(skb);

+ 0 - 1
net/ipv4/ip_forward.c

@@ -71,7 +71,6 @@ static int ip_forward_finish(struct net *net, struct sock *sk, struct sk_buff *s
 	if (unlikely(opt->optlen))
 	if (unlikely(opt->optlen))
 		ip_forward_options(skb);
 		ip_forward_options(skb);
 
 
-	skb_sender_cpu_clear(skb);
 	return dst_output(net, sk, skb);
 	return dst_output(net, sk, skb);
 }
 }
 
 

+ 0 - 1
net/ipv6/ip6_output.c

@@ -332,7 +332,6 @@ static int ip6_forward_proxy_check(struct sk_buff *skb)
 static inline int ip6_forward_finish(struct net *net, struct sock *sk,
 static inline int ip6_forward_finish(struct net *net, struct sock *sk,
 				     struct sk_buff *skb)
 				     struct sk_buff *skb)
 {
 {
-	skb_sender_cpu_clear(skb);
 	return dst_output(net, sk, skb);
 	return dst_output(net, sk, skb);
 }
 }
 
 

+ 0 - 6
net/netfilter/ipvs/ip_vs_xmit.c

@@ -531,8 +531,6 @@ static inline int ip_vs_tunnel_xmit_prepare(struct sk_buff *skb,
 	if (ret == NF_ACCEPT) {
 	if (ret == NF_ACCEPT) {
 		nf_reset(skb);
 		nf_reset(skb);
 		skb_forward_csum(skb);
 		skb_forward_csum(skb);
-		if (!skb->sk)
-			skb_sender_cpu_clear(skb);
 	}
 	}
 	return ret;
 	return ret;
 }
 }
@@ -573,8 +571,6 @@ static inline int ip_vs_nat_send_or_cont(int pf, struct sk_buff *skb,
 
 
 	if (!local) {
 	if (!local) {
 		skb_forward_csum(skb);
 		skb_forward_csum(skb);
-		if (!skb->sk)
-			skb_sender_cpu_clear(skb);
 		NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb,
 		NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb,
 			NULL, skb_dst(skb)->dev, dst_output);
 			NULL, skb_dst(skb)->dev, dst_output);
 	} else
 	} else
@@ -595,8 +591,6 @@ static inline int ip_vs_send_or_cont(int pf, struct sk_buff *skb,
 	if (!local) {
 	if (!local) {
 		ip_vs_drop_early_demux_sk(skb);
 		ip_vs_drop_early_demux_sk(skb);
 		skb_forward_csum(skb);
 		skb_forward_csum(skb);
-		if (!skb->sk)
-			skb_sender_cpu_clear(skb);
 		NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb,
 		NF_HOOK(pf, NF_INET_LOCAL_OUT, cp->ipvs->net, NULL, skb,
 			NULL, skb_dst(skb)->dev, dst_output);
 			NULL, skb_dst(skb)->dev, dst_output);
 	} else
 	} else

+ 0 - 1
net/netfilter/nf_dup_netdev.c

@@ -31,7 +31,6 @@ void nf_dup_netdev_egress(const struct nft_pktinfo *pkt, int oif)
 		skb_push(skb, skb->mac_len);
 		skb_push(skb, skb->mac_len);
 
 
 	skb->dev = dev;
 	skb->dev = dev;
-	skb_sender_cpu_clear(skb);
 	dev_queue_xmit(skb);
 	dev_queue_xmit(skb);
 }
 }
 EXPORT_SYMBOL_GPL(nf_dup_netdev_egress);
 EXPORT_SYMBOL_GPL(nf_dup_netdev_egress);

+ 0 - 1
net/sched/act_mirred.c

@@ -182,7 +182,6 @@ static int tcf_mirred(struct sk_buff *skb, const struct tc_action *a,
 
 
 	skb2->skb_iif = skb->dev->ifindex;
 	skb2->skb_iif = skb->dev->ifindex;
 	skb2->dev = dev;
 	skb2->dev = dev;
-	skb_sender_cpu_clear(skb2);
 	err = dev_queue_xmit(skb2);
 	err = dev_queue_xmit(skb2);
 
 
 	if (err) {
 	if (err) {