* [PATCH] netfilter/IPv6: fix DSCP mangle code @ 2011-04-22 7:02 Fernando Luis Vazquez Cao 2011-04-22 7:08 ` David Miller 2011-04-22 7:19 ` [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module Fernando Luis Vazquez Cao 0 siblings, 2 replies; 20+ messages in thread From: Fernando Luis Vazquez Cao @ 2011-04-22 7:02 UTC (permalink / raw) To: netdev; +Cc: davem, yoshfuji, jengelh The mask indicates the bits one wants to zero out, so it needs to be inverted before applying to the original TOS field. Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> --- diff -urNp linux-2.6.37-orig/net/netfilter/xt_DSCP.c linux-2.6.37/net/netfilter/xt_DSCP.c --- linux-2.6.37-orig/net/netfilter/xt_DSCP.c 2011-01-05 09:50:19.000000000 +0900 +++ linux-2.6.37/net/netfilter/xt_DSCP.c 2011-04-21 16:01:25.801890733 +0900 @@ -99,7 +99,7 @@ tos_tg6(struct sk_buff *skb, const struc u_int8_t orig, nv; orig = ipv6_get_dsfield(iph); - nv = (orig & info->tos_mask) ^ info->tos_value; + nv = (orig & ~info->tos_mask) ^ info->tos_value; if (orig != nv) { if (!skb_make_writable(skb, sizeof(struct iphdr))) ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: fix DSCP mangle code 2011-04-22 7:02 [PATCH] netfilter/IPv6: fix DSCP mangle code Fernando Luis Vazquez Cao @ 2011-04-22 7:08 ` David Miller 2011-04-22 7:29 ` Fernando Luis Vazquez Cao 2011-04-22 7:19 ` [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module Fernando Luis Vazquez Cao 1 sibling, 1 reply; 20+ messages in thread From: David Miller @ 2011-04-22 7:08 UTC (permalink / raw) To: fernando; +Cc: netdev, yoshfuji, jengelh, netfilter-devel From: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> Date: Fri, 22 Apr 2011 16:02:39 +0900 > The mask indicates the bits one wants to zero out, so it needs to be > inverted before applying to the original TOS field. > > Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> > --- Netfilter patches should be sent to the netfilter developer list, CC:'d > diff -urNp linux-2.6.37-orig/net/netfilter/xt_DSCP.c linux-2.6.37/net/netfilter/xt_DSCP.c > --- linux-2.6.37-orig/net/netfilter/xt_DSCP.c 2011-01-05 09:50:19.000000000 +0900 > +++ linux-2.6.37/net/netfilter/xt_DSCP.c 2011-04-21 16:01:25.801890733 +0900 > @@ -99,7 +99,7 @@ tos_tg6(struct sk_buff *skb, const struc > u_int8_t orig, nv; > > orig = ipv6_get_dsfield(iph); > - nv = (orig & info->tos_mask) ^ info->tos_value; > + nv = (orig & ~info->tos_mask) ^ info->tos_value; > > if (orig != nv) { > if (!skb_make_writable(skb, sizeof(struct iphdr))) > > ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: fix DSCP mangle code 2011-04-22 7:08 ` David Miller @ 2011-04-22 7:29 ` Fernando Luis Vazquez Cao 0 siblings, 0 replies; 20+ messages in thread From: Fernando Luis Vazquez Cao @ 2011-04-22 7:29 UTC (permalink / raw) To: David Miller; +Cc: netdev, yoshfuji, jengelh, netfilter-devel On Fri, 2011-04-22 at 00:08 -0700, David Miller wrote: > From: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> > Date: Fri, 22 Apr 2011 16:02:39 +0900 > > > The mask indicates the bits one wants to zero out, so it needs to be > > inverted before applying to the original TOS field. > > > > Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> > > --- > > Netfilter patches should be sent to the netfilter developer > list, CC:'d Thank you for the heads-up, David. By the way, I have just sent one more patch that fixes what I think is another netfilter bug. If everyone is ok with these two patches it would be great if we could get them merged for the next -rc release (we hit these bugs in our production systems). Regards, Fernando ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-04-22 7:02 [PATCH] netfilter/IPv6: fix DSCP mangle code Fernando Luis Vazquez Cao 2011-04-22 7:08 ` David Miller @ 2011-04-22 7:19 ` Fernando Luis Vazquez Cao 2011-04-22 7:34 ` Eric Dumazet 1 sibling, 1 reply; 20+ messages in thread From: Fernando Luis Vazquez Cao @ 2011-04-22 7:19 UTC (permalink / raw) To: netfilter-devel; +Cc: netdev, yoshfuji, jengelh, davem The IPv6 header is not zeroed out in alloc_skb so we must initialize it properly unless we want to see IPv6 packets with random TOS fields floating around. The current implementation resets the flow label but this could be changed if deemed necessary. We stumbled upon this issue when trying to apply a mangle rule to the RST packet generated by the REJECT target module. Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> --- diff -urNp linux-2.6.38.4-orig/net/ipv6/netfilter/ip6t_REJECT.c linux-2.6.38.4/net/ipv6/netfilter/ip6t_REJECT.c --- linux-2.6.38.4-orig/net/ipv6/netfilter/ip6t_REJECT.c 2011-03-15 10:20:32.000000000 +0900 +++ linux-2.6.38.4/net/ipv6/netfilter/ip6t_REJECT.c 2011-04-22 15:00:30.695373543 +0900 @@ -45,6 +45,8 @@ static void send_reset(struct net *net, int tcphoff, needs_ack; const struct ipv6hdr *oip6h = ipv6_hdr(oldskb); struct ipv6hdr *ip6h; +#define DEFAULT_TOS_VALUE 0x0U + const __u8 tclass = DEFAULT_TOS_VALUE; struct dst_entry *dst = NULL; u8 proto; struct flowi fl; @@ -123,7 +125,7 @@ static void send_reset(struct net *net, skb_put(nskb, sizeof(struct ipv6hdr)); skb_reset_network_header(nskb); ip6h = ipv6_hdr(nskb); - ip6h->version = 6; + *(__be32 *)ip6h = htonl(0x60000000 | (tclass << 20)); ip6h->hop_limit = ip6_dst_hoplimit(dst); ip6h->nexthdr = IPPROTO_TCP; ipv6_addr_copy(&ip6h->saddr, &oip6h->daddr); ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-04-22 7:19 ` [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module Fernando Luis Vazquez Cao @ 2011-04-22 7:34 ` Eric Dumazet 2011-04-22 7:47 ` Fernando Luis Vazquez Cao 0 siblings, 1 reply; 20+ messages in thread From: Eric Dumazet @ 2011-04-22 7:34 UTC (permalink / raw) To: Fernando Luis Vazquez Cao Cc: netfilter-devel, netdev, yoshfuji, jengelh, davem Le vendredi 22 avril 2011 à 16:19 +0900, Fernando Luis Vazquez Cao a écrit : > The IPv6 header is not zeroed out in alloc_skb so we must initialize it > properly unless we want to see IPv6 packets with random TOS fields > floating around. The current implementation resets the flow label > but this could be changed if deemed necessary. > > We stumbled upon this issue when trying to apply a mangle rule to > the RST packet generated by the REJECT target module. > > Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> > --- > > diff -urNp linux-2.6.38.4-orig/net/ipv6/netfilter/ip6t_REJECT.c linux-2.6.38.4/net/ipv6/netfilter/ip6t_REJECT.c > --- linux-2.6.38.4-orig/net/ipv6/netfilter/ip6t_REJECT.c 2011-03-15 10:20:32.000000000 +0900 > +++ linux-2.6.38.4/net/ipv6/netfilter/ip6t_REJECT.c 2011-04-22 15:00:30.695373543 +0900 > @@ -45,6 +45,8 @@ static void send_reset(struct net *net, > int tcphoff, needs_ack; > const struct ipv6hdr *oip6h = ipv6_hdr(oldskb); > struct ipv6hdr *ip6h; > +#define DEFAULT_TOS_VALUE 0x0U > + const __u8 tclass = DEFAULT_TOS_VALUE; > struct dst_entry *dst = NULL; > u8 proto; > struct flowi fl; > @@ -123,7 +125,7 @@ static void send_reset(struct net *net, > skb_put(nskb, sizeof(struct ipv6hdr)); > skb_reset_network_header(nskb); > ip6h = ipv6_hdr(nskb); > - ip6h->version = 6; > + *(__be32 *)ip6h = htonl(0x60000000 | (tclass << 20)); It seems fine but I am wondering where is payload_len set ? ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-04-22 7:34 ` Eric Dumazet @ 2011-04-22 7:47 ` Fernando Luis Vazquez Cao 2011-04-22 8:06 ` Eric Dumazet 0 siblings, 1 reply; 20+ messages in thread From: Fernando Luis Vazquez Cao @ 2011-04-22 7:47 UTC (permalink / raw) To: Eric Dumazet; +Cc: netfilter-devel, netdev, yoshfuji, jengelh, davem On Fri, 2011-04-22 at 09:34 +0200, Eric Dumazet wrote: > Le vendredi 22 avril 2011 à 16:19 +0900, Fernando Luis Vazquez Cao a > écrit : > > The IPv6 header is not zeroed out in alloc_skb so we must initialize it > > properly unless we want to see IPv6 packets with random TOS fields > > floating around. The current implementation resets the flow label > > but this could be changed if deemed necessary. > > > > We stumbled upon this issue when trying to apply a mangle rule to > > the RST packet generated by the REJECT target module. > > > > Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> > > --- > > > > diff -urNp linux-2.6.38.4-orig/net/ipv6/netfilter/ip6t_REJECT.c linux-2.6.38.4/net/ipv6/netfilter/ip6t_REJECT.c > > --- linux-2.6.38.4-orig/net/ipv6/netfilter/ip6t_REJECT.c 2011-03-15 10:20:32.000000000 +0900 > > +++ linux-2.6.38.4/net/ipv6/netfilter/ip6t_REJECT.c 2011-04-22 15:00:30.695373543 +0900 > > @@ -45,6 +45,8 @@ static void send_reset(struct net *net, > > int tcphoff, needs_ack; > > const struct ipv6hdr *oip6h = ipv6_hdr(oldskb); > > struct ipv6hdr *ip6h; > > +#define DEFAULT_TOS_VALUE 0x0U > > + const __u8 tclass = DEFAULT_TOS_VALUE; > > struct dst_entry *dst = NULL; > > u8 proto; > > struct flowi fl; > > @@ -123,7 +125,7 @@ static void send_reset(struct net *net, > > skb_put(nskb, sizeof(struct ipv6hdr)); > > skb_reset_network_header(nskb); > > ip6h = ipv6_hdr(nskb); > > - ip6h->version = 6; > > + *(__be32 *)ip6h = htonl(0x60000000 | (tclass << 20)); > > It seems fine but I am wondering where is payload_len set ? Hi Eric, Thank you for the review, I really appreciate it. payload_len is set in __ip6_local_out() which is called from ip6_local_out. Could I get your acked-by for the two patches I sent? Thanks, Fernando -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-04-22 7:47 ` Fernando Luis Vazquez Cao @ 2011-04-22 8:06 ` Eric Dumazet 2011-04-22 8:11 ` Fernando Luis Vazquez Cao 0 siblings, 1 reply; 20+ messages in thread From: Eric Dumazet @ 2011-04-22 8:06 UTC (permalink / raw) To: Fernando Luis Vazquez Cao Cc: netfilter-devel, netdev, yoshfuji, jengelh, davem Le vendredi 22 avril 2011 à 16:47 +0900, Fernando Luis Vazquez Cao a écrit : > Hi Eric, > > Thank you for the review, I really appreciate it. > > payload_len is set in __ip6_local_out() which is called from > ip6_local_out. > Thats right, thanks ! > Could I get your acked-by for the two patches I sent? > Sure Acked-by: Eric Dumazet <eric.dumazet@gmail.com> -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-04-22 8:06 ` Eric Dumazet @ 2011-04-22 8:11 ` Fernando Luis Vazquez Cao 2011-04-22 8:37 ` Eric Dumazet 0 siblings, 1 reply; 20+ messages in thread From: Fernando Luis Vazquez Cao @ 2011-04-22 8:11 UTC (permalink / raw) To: Eric Dumazet; +Cc: netfilter-devel, netdev, yoshfuji, jengelh, davem On Fri, 2011-04-22 at 10:06 +0200, Eric Dumazet wrote: > Le vendredi 22 avril 2011 à 16:47 +0900, Fernando Luis Vazquez Cao a > écrit : > > Could I get your acked-by for the two patches I sent? > > > > Sure > > Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Thank you! Should we send these two patches to -stable too? ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-04-22 8:11 ` Fernando Luis Vazquez Cao @ 2011-04-22 8:37 ` Eric Dumazet 2011-04-26 1:13 ` Pablo Neira Ayuso 0 siblings, 1 reply; 20+ messages in thread From: Eric Dumazet @ 2011-04-22 8:37 UTC (permalink / raw) To: Fernando Luis Vazquez Cao Cc: netfilter-devel, netdev, yoshfuji, jengelh, davem Le vendredi 22 avril 2011 à 17:11 +0900, Fernando Luis Vazquez Cao a écrit : > Thank you! > > Should we send these two patches to -stable too? > David takes care of stable submissions for netdev stuff, thanks. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-04-22 8:37 ` Eric Dumazet @ 2011-04-26 1:13 ` Pablo Neira Ayuso 2011-04-26 1:26 ` Fernando Luis Vazquez Cao 2011-04-26 5:17 ` David Miller 0 siblings, 2 replies; 20+ messages in thread From: Pablo Neira Ayuso @ 2011-04-26 1:13 UTC (permalink / raw) To: Eric Dumazet Cc: Fernando Luis Vazquez Cao, netfilter-devel, netdev, yoshfuji, jengelh, davem On 22/04/11 10:37, Eric Dumazet wrote: > Le vendredi 22 avril 2011 à 17:11 +0900, Fernando Luis Vazquez Cao a > écrit : > >> Thank you! >> >> Should we send these two patches to -stable too? > > David takes care of stable submissions for netdev stuff, thanks. If the patch follows the netfilter path, we'll take care of sending stable submissions. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-04-26 1:13 ` Pablo Neira Ayuso @ 2011-04-26 1:26 ` Fernando Luis Vazquez Cao 2011-04-26 5:17 ` David Miller 2011-04-26 5:17 ` David Miller 1 sibling, 1 reply; 20+ messages in thread From: Fernando Luis Vazquez Cao @ 2011-04-26 1:26 UTC (permalink / raw) To: Pablo Neira Ayuso Cc: Eric Dumazet, netfilter-devel, netdev, yoshfuji, jengelh, davem On Tue, 2011-04-26 at 03:13 +0200, Pablo Neira Ayuso wrote: > On 22/04/11 10:37, Eric Dumazet wrote: > > Le vendredi 22 avril 2011 à 17:11 +0900, Fernando Luis Vazquez Cao a > > écrit : > > > >> Thank you! > >> > >> Should we send these two patches to -stable too? > > > > David takes care of stable submissions for netdev stuff, thanks. > > If the patch follows the netfilter path, we'll take care of sending > stable submissions. David, will you take care of these two patches or should they go through the netfilter tree? -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-04-26 1:26 ` Fernando Luis Vazquez Cao @ 2011-04-26 5:17 ` David Miller 2011-04-26 5:25 ` Fernando Luis Vazquez Cao 0 siblings, 1 reply; 20+ messages in thread From: David Miller @ 2011-04-26 5:17 UTC (permalink / raw) To: fernando; +Cc: pablo, eric.dumazet, netfilter-devel, netdev, yoshfuji, jengelh From: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> Date: Tue, 26 Apr 2011 10:26:20 +0900 > On Tue, 2011-04-26 at 03:13 +0200, Pablo Neira Ayuso wrote: >> On 22/04/11 10:37, Eric Dumazet wrote: >> > Le vendredi 22 avril 2011 à 17:11 +0900, Fernando Luis Vazquez Cao a >> > écrit : >> > >> >> Thank you! >> >> >> >> Should we send these two patches to -stable too? >> > >> > David takes care of stable submissions for netdev stuff, thanks. >> >> If the patch follows the netfilter path, we'll take care of sending >> stable submissions. > > David, will you take care of these two patches or should they go through > the netfilter tree? Netfilter, as usual. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-04-26 5:17 ` David Miller @ 2011-04-26 5:25 ` Fernando Luis Vazquez Cao 2011-04-26 15:34 ` Pablo Neira Ayuso 0 siblings, 1 reply; 20+ messages in thread From: Fernando Luis Vazquez Cao @ 2011-04-26 5:25 UTC (permalink / raw) To: David Miller Cc: pablo, eric.dumazet, netfilter-devel, netdev, yoshfuji, jengelh On Mon, 2011-04-25 at 22:17 -0700, David Miller wrote: > From: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> > Date: Tue, 26 Apr 2011 10:26:20 +0900 > > > On Tue, 2011-04-26 at 03:13 +0200, Pablo Neira Ayuso wrote: > >> On 22/04/11 10:37, Eric Dumazet wrote: > >> > Le vendredi 22 avril 2011 à 17:11 +0900, Fernando Luis Vazquez Cao a > >> > écrit : > >> > > >> >> Thank you! > >> >> > >> >> Should we send these two patches to -stable too? > >> > > >> > David takes care of stable submissions for netdev stuff, thanks. > >> > >> If the patch follows the netfilter path, we'll take care of sending > >> stable submissions. > > > > David, will you take care of these two patches or should they go through > > the netfilter tree? > > Netfilter, as usual. Thank you for the clarification. I really appreciate it. Pablo, could you pull in the two patches below? They have already been acked by Eric. It would be great it we could get them merged for the next -rc and stable releases. [PATCH] netfilter/IPv6: fix DSCP mangle code [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module - Fernando -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-04-26 5:25 ` Fernando Luis Vazquez Cao @ 2011-04-26 15:34 ` Pablo Neira Ayuso 2011-04-26 15:35 ` Pablo Neira Ayuso 2011-05-06 8:27 ` Fernando Luis Vázquez Cao 0 siblings, 2 replies; 20+ messages in thread From: Pablo Neira Ayuso @ 2011-04-26 15:34 UTC (permalink / raw) To: Fernando Luis Vazquez Cao Cc: David Miller, eric.dumazet, netfilter-devel, netdev, yoshfuji, jengelh, Patrick McHardy On 26/04/11 07:25, Fernando Luis Vazquez Cao wrote: > On Mon, 2011-04-25 at 22:17 -0700, David Miller wrote: >> From: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> >> Date: Tue, 26 Apr 2011 10:26:20 +0900 >> >>> On Tue, 2011-04-26 at 03:13 +0200, Pablo Neira Ayuso wrote: >>>> On 22/04/11 10:37, Eric Dumazet wrote: >>>>> Le vendredi 22 avril 2011 à 17:11 +0900, Fernando Luis Vazquez Cao a >>>>> écrit : >>>>> >>>>>> Thank you! >>>>>> >>>>>> Should we send these two patches to -stable too? >>>>> >>>>> David takes care of stable submissions for netdev stuff, thanks. >>>> >>>> If the patch follows the netfilter path, we'll take care of sending >>>> stable submissions. >>> >>> David, will you take care of these two patches or should they go through >>> the netfilter tree? >> >> Netfilter, as usual. > > Thank you for the clarification. I really appreciate it. > > Pablo, could you pull in the two patches below? They have already been > acked by Eric. It would be great it we could get them merged for the > next -rc and stable releases. > > [PATCH] netfilter/IPv6: fix DSCP mangle code > [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module Patrick is the primary link to take patches, I'm including him in this CC. If he experiences any problem, I'll make sure that these hit -rc, so never mind. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-04-26 15:34 ` Pablo Neira Ayuso @ 2011-04-26 15:35 ` Pablo Neira Ayuso 2011-04-27 4:21 ` Fernando Luis Vazquez Cao 2011-05-06 8:27 ` Fernando Luis Vázquez Cao 1 sibling, 1 reply; 20+ messages in thread From: Pablo Neira Ayuso @ 2011-04-26 15:35 UTC (permalink / raw) To: Fernando Luis Vazquez Cao Cc: David Miller, eric.dumazet, netfilter-devel, netdev, yoshfuji, jengelh, Patrick McHardy On 26/04/11 17:34, Pablo Neira Ayuso wrote: > On 26/04/11 07:25, Fernando Luis Vazquez Cao wrote: >> On Mon, 2011-04-25 at 22:17 -0700, David Miller wrote: >>> From: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> >>> Date: Tue, 26 Apr 2011 10:26:20 +0900 >>> >>>> On Tue, 2011-04-26 at 03:13 +0200, Pablo Neira Ayuso wrote: >>>>> On 22/04/11 10:37, Eric Dumazet wrote: >>>>>> Le vendredi 22 avril 2011 à 17:11 +0900, Fernando Luis Vazquez Cao a >>>>>> écrit : >>>>>> >>>>>>> Thank you! >>>>>>> >>>>>>> Should we send these two patches to -stable too? >>>>>> >>>>>> David takes care of stable submissions for netdev stuff, thanks. >>>>> >>>>> If the patch follows the netfilter path, we'll take care of sending >>>>> stable submissions. >>>> >>>> David, will you take care of these two patches or should they go through >>>> the netfilter tree? >>> >>> Netfilter, as usual. >> >> Thank you for the clarification. I really appreciate it. >> >> Pablo, could you pull in the two patches below? They have already been >> acked by Eric. It would be great it we could get them merged for the >> next -rc and stable releases. >> >> [PATCH] netfilter/IPv6: fix DSCP mangle code >> [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module > > Patrick is the primary link to take patches, I'm including him in this > CC. If he experiences any problem, I'll make sure that these hit -rc, so > never mind. ^^^^^^^^^^ Sorry, I meant to say, "don't worry" :-) ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-04-26 15:35 ` Pablo Neira Ayuso @ 2011-04-27 4:21 ` Fernando Luis Vazquez Cao 0 siblings, 0 replies; 20+ messages in thread From: Fernando Luis Vazquez Cao @ 2011-04-27 4:21 UTC (permalink / raw) To: Pablo Neira Ayuso Cc: David Miller, eric.dumazet, netfilter-devel, netdev, yoshfuji, jengelh, Patrick McHardy On Tue, 2011-04-26 at 17:35 +0200, Pablo Neira Ayuso wrote: > On 26/04/11 17:34, Pablo Neira Ayuso wrote: > > On 26/04/11 07:25, Fernando Luis Vazquez Cao wrote: > >> Pablo, could you pull in the two patches below? They have already been > >> acked by Eric. It would be great it we could get them merged for the > >> next -rc and stable releases. > >> > >> [PATCH] netfilter/IPv6: fix DSCP mangle code > >> [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module > > > > Patrick is the primary link to take patches, I'm including him in this > > CC. If he experiences any problem, I'll make sure that these hit -rc, so > > never mind. > ^^^^^^^^^^ > > Sorry, I meant to say, "don't worry" :-) Thank you, Pablo. I really appreciate it. - Fernando ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-04-26 15:34 ` Pablo Neira Ayuso 2011-04-26 15:35 ` Pablo Neira Ayuso @ 2011-05-06 8:27 ` Fernando Luis Vázquez Cao 2011-05-06 10:38 ` Pablo Neira Ayuso 1 sibling, 1 reply; 20+ messages in thread From: Fernando Luis Vázquez Cao @ 2011-05-06 8:27 UTC (permalink / raw) To: Pablo Neira Ayuso Cc: David Miller, eric.dumazet, netfilter-devel, netdev, yoshfuji, jengelh, Patrick McHardy On Tue, 2011-04-26 at 17:34 +0200, Pablo Neira Ayuso wrote: > On 26/04/11 07:25, Fernando Luis Vazquez Cao wrote: > > Pablo, could you pull in the two patches below? They have already been > > acked by Eric. It would be great it we could get them merged for the > > next -rc and stable releases. > > > > [PATCH] netfilter/IPv6: fix DSCP mangle code > > [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module > > Patrick is the primary link to take patches, I'm including him in this > CC. If he experiences any problem, I'll make sure that these hit -rc, so > never mind. It seems that the two patches above did not make it into 2.6.39-rc6. Any chance we can get them merged before 2.6.39 is released? Thanks, Fernando ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-05-06 8:27 ` Fernando Luis Vázquez Cao @ 2011-05-06 10:38 ` Pablo Neira Ayuso 2011-05-06 10:45 ` Jan Engelhardt 0 siblings, 1 reply; 20+ messages in thread From: Pablo Neira Ayuso @ 2011-05-06 10:38 UTC (permalink / raw) To: Fernando Luis Vázquez Cao Cc: David Miller, eric.dumazet, netfilter-devel, netdev, yoshfuji, jengelh, Patrick McHardy On 06/05/11 10:27, Fernando Luis Vázquez Cao wrote: > On Tue, 2011-04-26 at 17:34 +0200, Pablo Neira Ayuso wrote: >> On 26/04/11 07:25, Fernando Luis Vazquez Cao wrote: >>> Pablo, could you pull in the two patches below? They have already been >>> acked by Eric. It would be great it we could get them merged for the >>> next -rc and stable releases. >>> >>> [PATCH] netfilter/IPv6: fix DSCP mangle code >>> [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module >> >> Patrick is the primary link to take patches, I'm including him in this >> CC. If he experiences any problem, I'll make sure that these hit -rc, so >> never mind. > > It seems that the two patches above did not make it into 2.6.39-rc6. Any > chance we can get them merged before 2.6.39 is released? I'll pick them and push them to davem by monday. Thanks! ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-05-06 10:38 ` Pablo Neira Ayuso @ 2011-05-06 10:45 ` Jan Engelhardt 0 siblings, 0 replies; 20+ messages in thread From: Jan Engelhardt @ 2011-05-06 10:45 UTC (permalink / raw) To: Pablo Neira Ayuso Cc: Fernando Luis Vázquez Cao, David Miller, eric.dumazet, netfilter-devel, netdev, yoshfuji, Patrick McHardy On Friday 2011-05-06 12:38, Pablo Neira Ayuso wrote: >On 06/05/11 10:27, Fernando Luis Vázquez Cao wrote: >> On Tue, 2011-04-26 at 17:34 +0200, Pablo Neira Ayuso wrote: >>> On 26/04/11 07:25, Fernando Luis Vazquez Cao wrote: >>>> Pablo, could you pull in the two patches below? They have already been >>>> acked by Eric. It would be great it we could get them merged for the >>>> next -rc and stable releases. >>>> >>>> [PATCH] netfilter/IPv6: fix DSCP mangle code >>>> [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module >>> >>> Patrick is the primary link to take patches, I'm including him in this >>> CC. If he experiences any problem, I'll make sure that these hit -rc, so >>> never mind. >> >> It seems that the two patches above did not make it into 2.6.39-rc6. Any >> chance we can get them merged before 2.6.39 is released? > >I'll pick them and push them to davem by monday. Thanks! Also revert a2361c8735e07322023aedc36e4938b35af31eb0 please. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module 2011-04-26 1:13 ` Pablo Neira Ayuso 2011-04-26 1:26 ` Fernando Luis Vazquez Cao @ 2011-04-26 5:17 ` David Miller 1 sibling, 0 replies; 20+ messages in thread From: David Miller @ 2011-04-26 5:17 UTC (permalink / raw) To: pablo; +Cc: eric.dumazet, fernando, netfilter-devel, netdev, yoshfuji, jengelh From: Pablo Neira Ayuso <pablo@netfilter.org> Date: Tue, 26 Apr 2011 03:13:16 +0200 > On 22/04/11 10:37, Eric Dumazet wrote: >> Le vendredi 22 avril 2011 à 17:11 +0900, Fernando Luis Vazquez Cao a >> écrit : >> >>> Thank you! >>> >>> Should we send these two patches to -stable too? >> >> David takes care of stable submissions for netdev stuff, thanks. > > If the patch follows the netfilter path, we'll take care of sending > stable submissions. Right. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2011-05-06 10:45 UTC | newest] Thread overview: 20+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-04-22 7:02 [PATCH] netfilter/IPv6: fix DSCP mangle code Fernando Luis Vazquez Cao 2011-04-22 7:08 ` David Miller 2011-04-22 7:29 ` Fernando Luis Vazquez Cao 2011-04-22 7:19 ` [PATCH] netfilter/IPv6: initialize TOS field in REJECT target module Fernando Luis Vazquez Cao 2011-04-22 7:34 ` Eric Dumazet 2011-04-22 7:47 ` Fernando Luis Vazquez Cao 2011-04-22 8:06 ` Eric Dumazet 2011-04-22 8:11 ` Fernando Luis Vazquez Cao 2011-04-22 8:37 ` Eric Dumazet 2011-04-26 1:13 ` Pablo Neira Ayuso 2011-04-26 1:26 ` Fernando Luis Vazquez Cao 2011-04-26 5:17 ` David Miller 2011-04-26 5:25 ` Fernando Luis Vazquez Cao 2011-04-26 15:34 ` Pablo Neira Ayuso 2011-04-26 15:35 ` Pablo Neira Ayuso 2011-04-27 4:21 ` Fernando Luis Vazquez Cao 2011-05-06 8:27 ` Fernando Luis Vázquez Cao 2011-05-06 10:38 ` Pablo Neira Ayuso 2011-05-06 10:45 ` Jan Engelhardt 2011-04-26 5:17 ` David Miller
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).