netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Fix comment for packets without data
@ 2012-12-13 18:27 Florent Fourcot
  2012-12-13 18:51 ` Rick Jones
  0 siblings, 1 reply; 6+ messages in thread
From: Florent Fourcot @ 2012-12-13 18:27 UTC (permalink / raw)
  To: pablo, yoshfuji; +Cc: netdev, netfilter-devel, Florent Fourcot

The double negation is probably a typo error

Signed-off-by: Florent Fourcot <florent.fourcot@enst-bretagne.fr>
---
 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index 00ee17c..d9efe32 100644
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -81,7 +81,7 @@ static int ipv6_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,
 	}
 	protoff = ipv6_skip_exthdr(skb, extoff, &nexthdr, &frag_off);
 	/*
-	 * (protoff == skb->len) mean that the packet doesn't have no data
+	 * (protoff == skb->len) mean that the packet does not have any data
 	 * except of IPv6 & ext headers. but it's tracked anyway. - YK
 	 */
 	if (protoff < 0 || (frag_off & htons(~0x7)) != 0) {
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] Fix comment for packets without data
  2012-12-13 18:27 [PATCH] Fix comment for packets without data Florent Fourcot
@ 2012-12-13 18:51 ` Rick Jones
  2012-12-14 10:53   ` Florent Fourcot
  2012-12-14 10:56   ` Florent Fourcot
  0 siblings, 2 replies; 6+ messages in thread
From: Rick Jones @ 2012-12-13 18:51 UTC (permalink / raw)
  To: Florent Fourcot; +Cc: pablo, yoshfuji, netdev, netfilter-devel

On 12/13/2012 10:27 AM, Florent Fourcot wrote:
> The double negation is probably a typo error
>
> Signed-off-by: Florent Fourcot <florent.fourcot@enst-bretagne.fr>
> ---
>   net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
> index 00ee17c..d9efe32 100644
> --- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
> +++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
> @@ -81,7 +81,7 @@ static int ipv6_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,
>   	}
>   	protoff = ipv6_skip_exthdr(skb, extoff, &nexthdr, &frag_off);
>   	/*
> -	 * (protoff == skb->len) mean that the packet doesn't have no data
> +	 * (protoff == skb->len) mean that the packet does not have any data
>   	 * except of IPv6 & ext headers. but it's tracked anyway. - YK
>   	 */
>   	if (protoff < 0 || (frag_off & htons(~0x7)) != 0) {
>

Might as well take it to completion and have it read "(protoff == 
skb->len) means the packet does not have any data"  or "(protoff == 
skb->len) means the packet has no data"  Not sure about that next line 
with the except.  Perhaps "(protoff == skb->len) means the packet has no 
data, just IPv6 and extension headers, but it is tracked anyway."

rick jones

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH] Fix comment for packets without data
  2012-12-13 18:51 ` Rick Jones
@ 2012-12-14 10:53   ` Florent Fourcot
  2012-12-14 21:28     ` Rick Jones
  2012-12-14 10:56   ` Florent Fourcot
  1 sibling, 1 reply; 6+ messages in thread
From: Florent Fourcot @ 2012-12-14 10:53 UTC (permalink / raw)
  To: rick.jones2; +Cc: pablo, yoshfuji, netdev, netfilter-devel, Florent Fourcot

Remove ambiguity of double negation

Signed-off-by: Florent Fourcot <florent.fourcot@enst-bretagne.fr>
---
 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
index 00ee17c..137e245 100644
--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
@@ -81,8 +81,8 @@ static int ipv6_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,
 	}
 	protoff = ipv6_skip_exthdr(skb, extoff, &nexthdr, &frag_off);
 	/*
-	 * (protoff == skb->len) mean that the packet doesn't have no data
-	 * except of IPv6 & ext headers. but it's tracked anyway. - YK
+	 * (protoff == skb->len) means the packet has not data, just
+	 * IPv6 and possibly extensions headers, but it is tracked anyway
 	 */
 	if (protoff < 0 || (frag_off & htons(~0x7)) != 0) {
 		pr_debug("ip6_conntrack_core: can't find proto in pkt\n");
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] Fix comment for packets without data
  2012-12-13 18:51 ` Rick Jones
  2012-12-14 10:53   ` Florent Fourcot
@ 2012-12-14 10:56   ` Florent Fourcot
  1 sibling, 0 replies; 6+ messages in thread
From: Florent Fourcot @ 2012-12-14 10:56 UTC (permalink / raw)
  To: Rick Jones; +Cc: pablo, yoshfuji, netdev, netfilter-devel



> Perhaps "(protoff == skb->len) means the packet has no
> data, just IPv6 and extension headers, but it is tracked anyway."
> 

I agree, and I send a new patch. But I was not sure if I should add you
in "Signed-off-by" list.

Regards,

-- 
Florent.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Fix comment for packets without data
  2012-12-14 10:53   ` Florent Fourcot
@ 2012-12-14 21:28     ` Rick Jones
  2012-12-16 22:38       ` Pablo Neira Ayuso
  0 siblings, 1 reply; 6+ messages in thread
From: Rick Jones @ 2012-12-14 21:28 UTC (permalink / raw)
  To: Florent Fourcot; +Cc: pablo, yoshfuji, netdev, netfilter-devel

On 12/14/2012 02:53 AM, Florent Fourcot wrote:
> Remove ambiguity of double negation
>
> Signed-off-by: Florent Fourcot <florent.fourcot@enst-bretagne.fr>
> ---
>   net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c |    4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
> index 00ee17c..137e245 100644
> --- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
> +++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
> @@ -81,8 +81,8 @@ static int ipv6_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,
>   	}
>   	protoff = ipv6_skip_exthdr(skb, extoff, &nexthdr, &frag_off);
>   	/*
> -	 * (protoff == skb->len) mean that the packet doesn't have no data
> -	 * except of IPv6 & ext headers. but it's tracked anyway. - YK
> +	 * (protoff == skb->len) means the packet has not data, just
> +	 * IPv6 and possibly extensions headers, but it is tracked anyway
>   	 */
>   	if (protoff < 0 || (frag_off & htons(~0x7)) != 0) {
>   		pr_debug("ip6_conntrack_core: can't find proto in pkt\n");
>

Acked-by: Rick Jones <rick.jones2@hp.com>

rick

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] Fix comment for packets without data
  2012-12-14 21:28     ` Rick Jones
@ 2012-12-16 22:38       ` Pablo Neira Ayuso
  0 siblings, 0 replies; 6+ messages in thread
From: Pablo Neira Ayuso @ 2012-12-16 22:38 UTC (permalink / raw)
  To: Rick Jones; +Cc: Florent Fourcot, yoshfuji, netdev, netfilter-devel

On Fri, Dec 14, 2012 at 01:28:54PM -0800, Rick Jones wrote:
> On 12/14/2012 02:53 AM, Florent Fourcot wrote:
> >Remove ambiguity of double negation
> >
> >Signed-off-by: Florent Fourcot <florent.fourcot@enst-bretagne.fr>
> >---
> >  net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c |    4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> >diff --git a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
> >index 00ee17c..137e245 100644
> >--- a/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
> >+++ b/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
> >@@ -81,8 +81,8 @@ static int ipv6_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,
> >  	}
> >  	protoff = ipv6_skip_exthdr(skb, extoff, &nexthdr, &frag_off);
> >  	/*
> >-	 * (protoff == skb->len) mean that the packet doesn't have no data
> >-	 * except of IPv6 & ext headers. but it's tracked anyway. - YK
> >+	 * (protoff == skb->len) means the packet has not data, just
> >+	 * IPv6 and possibly extensions headers, but it is tracked anyway
> >  	 */
> >  	if (protoff < 0 || (frag_off & htons(~0x7)) != 0) {
> >  		pr_debug("ip6_conntrack_core: can't find proto in pkt\n");
> >
> 
> Acked-by: Rick Jones <rick.jones2@hp.com>

Applied, thanks.

That was many discussion for a patch to fix a comment, nice indeed :-)

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2012-12-16 22:38 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-13 18:27 [PATCH] Fix comment for packets without data Florent Fourcot
2012-12-13 18:51 ` Rick Jones
2012-12-14 10:53   ` Florent Fourcot
2012-12-14 21:28     ` Rick Jones
2012-12-16 22:38       ` Pablo Neira Ayuso
2012-12-14 10:56   ` Florent Fourcot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).