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

Commit 60ff7467 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

net: rename local_df to ignore_df 



As suggested by several people, rename local_df to ignore_df,
since it means "ignore df bit if it is set".

Cc: Maciej Żenczykowski <maze@google.com>
Cc: Florian Westphal <fw@strlen.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Acked-by: default avatarMaciej Żenczykowski <maze@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5f013c9b

include/linux/skbuff.h

+2 −2
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static inline u32 skb_mstamp_us_delta(const struct skb_mstamp *t1, 
 *	@csum_start: Offset from skb->head where checksumming should start

 *	@csum_offset: Offset from csum_start where checksum should be stored

 *	@priority: Packet queueing priority

 *	@local_df: allow local fragmentation

 *	@ignore_df: allow local fragmentation

 *	@cloned: Head may be cloned (check refcnt to be sure)

 *	@ip_summed: Driver fed us an IP checksum

 *	@nohdr: Payload reference only, must not modify header
@@ -514,7 +514,7 @@ struct sk_buff { 
	};

	__u32			priority;

	kmemcheck_bitfield_begin(flags1);

	__u8			local_df:1,

	__u8			ignore_df:1,

				cloned:1,

				ip_summed:2,

				nohdr:1,

include/net/ip.h

+3 −3
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ static inline bool ip_sk_use_pmtu(const struct sock *sk) 
	return inet_sk(sk)->pmtudisc < IP_PMTUDISC_PROBE;

}



static inline bool ip_sk_local_df(const struct sock *sk)

static inline bool ip_sk_ignore_df(const struct sock *sk)

{

	return inet_sk(sk)->pmtudisc < IP_PMTUDISC_DO ||

	       inet_sk(sk)->pmtudisc == IP_PMTUDISC_OMIT;
@@ -304,7 +304,7 @@ static inline void ip_select_ident(struct sk_buff *skb, struct dst_entry *dst, s 
{

	struct iphdr *iph = ip_hdr(skb);



	if ((iph->frag_off & htons(IP_DF)) && !skb->local_df) {

	if ((iph->frag_off & htons(IP_DF)) && !skb->ignore_df) {

		/* This is only to work around buggy Windows95/2000

		 * VJ compression implementations.  If the ID field

		 * does not change, they drop every other packet in
@@ -320,7 +320,7 @@ static inline void ip_select_ident_more(struct sk_buff *skb, struct dst_entry *d 
{

	struct iphdr *iph = ip_hdr(skb);



	if ((iph->frag_off & htons(IP_DF)) && !skb->local_df) {

	if ((iph->frag_off & htons(IP_DF)) && !skb->ignore_df) {

		if (sk && inet_sk(sk)->inet_daddr) {

			iph->id = htons(inet_sk(sk)->inet_id);

			inet_sk(sk)->inet_id += 1 + more;

include/net/ip6_route.h

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static inline bool ip6_sk_accept_pmtu(const struct sock *sk) 
	       inet6_sk(sk)->pmtudisc != IPV6_PMTUDISC_OMIT;

}



static inline bool ip6_sk_local_df(const struct sock *sk)

static inline bool ip6_sk_ignore_df(const struct sock *sk)

{

	return inet6_sk(sk)->pmtudisc < IPV6_PMTUDISC_DO ||

	       inet6_sk(sk)->pmtudisc == IPV6_PMTUDISC_OMIT;

net/core/skbuff.c

+2 −2
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old) 
#endif

	memcpy(new->cb, old->cb, sizeof(old->cb));

	new->csum		= old->csum;

	new->local_df		= old->local_df;

	new->ignore_df		= old->ignore_df;

	new->pkt_type		= old->pkt_type;

	new->ip_summed		= old->ip_summed;

	skb_copy_queue_mapping(new, old);
@@ -3913,7 +3913,7 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet) 
	skb->tstamp.tv64 = 0;

	skb->pkt_type = PACKET_HOST;

	skb->skb_iif = 0;

	skb->local_df = 0;

	skb->ignore_df = 0;

	skb_dst_drop(skb);

	skb->mark = 0;

	secpath_reset(skb);

net/ipv4/ip_forward.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
static bool ip_may_fragment(const struct sk_buff *skb)

{

	return unlikely((ip_hdr(skb)->frag_off & htons(IP_DF)) == 0) ||

		skb->local_df;

		skb->ignore_df;

}



static bool ip_exceeds_mtu(const struct sk_buff *skb, unsigned int mtu)