Subject: Re: [Patch net-next] net: rename local_df to ignore_df

From: Florian Westphal <[email-masked]>
Date: Mon, 5 May 2014 01:54:36 +0200

Cong Wang <[email-masked]> wrote:
> As suggested by several people, rename local_df to ignore_df,
> since it means "ignore df bit if it is set".

Thanks for doing this.

David, this has small conflict with a patch I sent couple of hours ago.

Also, I do have another bug fix patch that will move a function
evaluating skb->local_df around [ ie. targeted at net tree ]

That patch needs more testing but I will send it within next 30 hours.

> diff --git a/net/ipv4/ip_forward.c b/net/ipv4/ip_forward.c
> index be8abe7..8ac422f 100644
> --- a/net/ipv4/ip_forward.c
> +++ b/net/ipv4/ip_forward.c
> @@ -42,12 +42,12 @@
>  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;

nicely illustrates why the rename is a good idea, IMO.

[ should read '|| skb->ignore_df', the negation is wrong ]