On Mon, Feb 26, 2018 at 09:47:18AM +0100, Felix Fietkau wrote: > On 2018-02-26 09:40, Pablo Neira Ayuso wrote: > > On Mon, Feb 26, 2018 at 09:32:37AM +0100, Felix Fietkau wrote: > >> On 2018-02-26 09:28, Pablo Neira Ayuso wrote: > >> > On Mon, Feb 26, 2018 at 09:21:32AM +0100, Felix Fietkau wrote: > >> >> On 2018-02-25 20:08, Pablo Neira Ayuso wrote: > >> >> > On Sun, Feb 25, 2018 at 07:41:51PM +0100, Felix Fietkau wrote: > >> >> >> On 2018-02-25 19:39, Pablo Neira Ayuso wrote: > >> >> >> > On Sun, Feb 25, 2018 at 06:18:52PM +0100, Felix Fietkau wrote: > >> >> >> >> Add a missing call to csum_replace4 like on SNAT > >> >> >> >> > >> >> >> >> Signed-off-by: Felix Fietkau <nbd@xxxxxxxx> > >> >> >> >> --- > >> >> >> >> net/netfilter/nf_flow_table_ip.c | 1 + > >> >> >> >> 1 file changed, 1 insertion(+) > >> >> >> >> > >> >> >> >> diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c > >> >> >> >> index df58ed8be330..6d9d4b0599cc 100644 > >> >> >> >> --- a/net/netfilter/nf_flow_table_ip.c > >> >> >> >> +++ b/net/netfilter/nf_flow_table_ip.c > >> >> >> >> @@ -130,6 +130,7 @@ static int nf_flow_dnat_ip(const struct flow_offload *flow, struct sk_buff *skb, > >> >> >> >> default: > >> >> >> >> return -1; > >> >> >> >> } > >> >> >> >> + csum_replace4(&iph->check, addr, new_addr); > >> >> >> > > >> >> >> > This is a bugfix, right? > >> >> >> > > >> >> >> > I can get this into nf.git, thanks. > >> >> >> > >> >> >> Yes, that would be good. > >> >> > > >> >> > OK, applied, thanks Felix. > >> >> > >> >> Do you want me to resubmit my full series rebased after your merge? > >> > > >> > Yes. Please, keep this in your tree until I can get this fix into > >> > nf.git, thanks Felix! > >> > >> I see it in your nf.git already, which is what I'm basing my patches on. > >> So shall I resend now, or wait for further review from you? > > > > I see a clash between flowtable size and your rework to place ->params > > and ->gc() under ->init(), I would need to have a look to see how we > > can address this. I just would like to avoid undoing things later on > > This should be easy to fix, we could just pass the maximum size to the > ->init() function. If you want, I'll rebase my series on top of this > patch. I'd like to get my changes in as soon as possible to avoid too > much unnecessary churn during further development. OK, I'll rebase on top of yours, it's just one patch that I can easily rebase, so just get your patchset in sync with nf.git. Don't worry, we'll get this patchset in for this nf-next.git development cycle (4.17-rc). > > In your next patchset spin, if you could also provide slightly longer > > patch description, explaining the 'teardown' semantics, that would be > > good for the record. > > Will do. Thanks. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
