Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64d4e343 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

net: remove skb_sender_cpu_clear() 



After commit 52bd2d62 ("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: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8b4837c8

include/linux/skbuff.h

+0 −4
Original line number Diff line number Diff line
@@ -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;

};



static inline void skb_sender_cpu_clear(struct sk_buff *skb)

{

}



#ifdef NET_SKBUFF_DATA_USES_OFFSET

static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)

{

net/bridge/br_forward.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

	br_drop_fake_rtable(skb);

	skb_sender_cpu_clear(skb);



	if (skb->ip_summed == CHECKSUM_PARTIAL &&

	    (skb->protocol == htons(ETH_P_8021Q) ||

net/core/filter.c

+0 −2
Original line number Diff line number Diff line
@@ -1597,7 +1597,6 @@ static u64 bpf_clone_redirect(u64 r1, u64 ifindex, u64 flags, u64 r4, u64 r5) 
	}



	skb2->dev = dev;

	skb_sender_cpu_clear(skb2);

	return dev_queue_xmit(skb2);

}
@@ -1650,7 +1649,6 @@ int skb_do_redirect(struct sk_buff *skb) 
	}



	skb->dev = dev;

	skb_sender_cpu_clear(skb);

	return dev_queue_xmit(skb);

}

net/core/skbuff.c

+0 −1
Original line number Diff line number Diff line
@@ -4302,7 +4302,6 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet) 
	skb->skb_iif = 0;

	skb->ignore_df = 0;

	skb_dst_drop(skb);

	skb_sender_cpu_clear(skb);

	secpath_reset(skb);

	nf_reset(skb);

	nf_reset_trace(skb);

net/ipv4/ip_forward.c

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ static int ip_forward_finish(struct net *net, struct sock *sk, struct sk_buff *s 
	if (unlikely(opt->optlen))

		ip_forward_options(skb);



	skb_sender_cpu_clear(skb);

	return dst_output(net, sk, skb);

}