From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Dichtel Subject: Re: [PATCH net-next 4/6] ipv6: Pass struct net through ip6_fragment Date: Thu, 1 Oct 2015 10:31:43 +0200 Message-ID: <560CEF6F.4030403@6wind.com> References: <877fn7eh2f.fsf_-_@x220.int.ebiederm.org> <1443648336-31741-4-git-send-email-ebiederm@xmission.com> Reply-To: nicolas.dichtel@6wind.com Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Pablo Neira Ayuso , netfilter-devel@vger.kernel.org, netdev@vger.kernel.org To: "Eric W. Biederman" , David Miller Return-path: Received: from mail-wi0-f173.google.com ([209.85.212.173]:32836 "EHLO mail-wi0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751232AbbJAIbr (ORCPT ); Thu, 1 Oct 2015 04:31:47 -0400 Received: by wiclk2 with SMTP id lk2so21599143wic.0 for ; Thu, 01 Oct 2015 01:31:46 -0700 (PDT) In-Reply-To: <1443648336-31741-4-git-send-email-ebiederm@xmission.com> Sender: netdev-owner@vger.kernel.org List-ID: Le 30/09/2015 23:25, Eric W. Biederman a =C3=A9crit : > Signed-off-by: Eric W. Biederman > --- [snip] > diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c > index 0c3e9ffcf231..335066a64b45 100644 > --- a/net/ipv6/xfrm6_output.c > +++ b/net/ipv6/xfrm6_output.c > @@ -131,6 +131,12 @@ int xfrm6_output_finish(struct sock *sk, struct = sk_buff *skb) > return xfrm_output(sk, skb); > } > > +static int __xfrm6_output_finish(struct net *net, struct sock *sk, s= truct sk_buff *skb) > +{ > + struct xfrm_state *x =3D skb_dst(skb)->xfrm; nit: add an empty line after variables declaration. > + return x->outer_mode->afinfo->output_finish(sk, skb); > +} > + [snip]