From patchwork Thu Oct 1 16:44:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Eric W. Biederman" X-Patchwork-Id: 525189 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 15D24140B0D for ; Fri, 2 Oct 2015 02:52:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753127AbbJAQwR (ORCPT ); Thu, 1 Oct 2015 12:52:17 -0400 Received: from out02.mta.xmission.com ([166.70.13.232]:45397 "EHLO out02.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750844AbbJAQwQ (ORCPT ); Thu, 1 Oct 2015 12:52:16 -0400 Received: from in01.mta.xmission.com ([166.70.13.51]) by out02.mta.xmission.com with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1Zhh5b-0006Fk-6t; Thu, 01 Oct 2015 10:52:15 -0600 Received: from 67-3-201-231.omah.qwest.net ([67.3.201.231] helo=x220.int.ebiederm.org.xmission.com) by in01.mta.xmission.com with esmtpsa (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1Zhh5a-0007as-IM; Thu, 01 Oct 2015 10:52:14 -0600 From: ebiederm@xmission.com (Eric W. Biederman) To: Nicolas Dichtel Cc: David Miller , Pablo Neira Ayuso , netfilter-devel@vger.kernel.org, netdev@vger.kernel.org References: <877fn7eh2f.fsf_-_@x220.int.ebiederm.org> <1443648336-31741-4-git-send-email-ebiederm@xmission.com> <560CEF6F.4030403@6wind.com> Date: Thu, 01 Oct 2015 11:44:08 -0500 In-Reply-To: <560CEF6F.4030403@6wind.com> (Nicolas Dichtel's message of "Thu, 1 Oct 2015 10:31:43 +0200") Message-ID: <87y4fm8ron.fsf_-_@x220.int.ebiederm.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 X-XM-AID: U2FsdGVkX18Zgp9huvJ0hulmDvuuRVgEPDYAC2KLCrs= X-SA-Exim-Connect-IP: 67.3.201.231 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on sa06.xmission.com X-Spam-Level: X-Spam-Status: No, score=0.5 required=8.0 tests=ALL_TRUSTED,BAYES_50, DCC_CHECK_NEGATIVE, TVD_RCVD_IP, T_TooManySym_01, T_TooManySym_02, XMSubLong autolearn=disabled version=3.4.0 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.0 TVD_RCVD_IP Message was received from an IP address * 0.7 XMSubLong Long Subject * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.4995] * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa06 1397; Body=1 Fuz1=1 Fuz2=1] * 0.0 T_TooManySym_02 5+ unique symbols in subject * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: XMission; sa06 1397; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ;Nicolas Dichtel X-Spam-Relay-Country: X-Spam-Timing: total 196 ms - load_scoreonly_sql: 0.13 (0.1%), signal_user_changed: 4.1 (2.1%), b_tie_ro: 2.7 (1.4%), parse: 1.31 (0.7%), extract_message_metadata: 18 (9.4%), get_uri_detail_list: 0.99 (0.5%), tests_pri_-1000: 10 (4.9%), tests_pri_-950: 2.00 (1.0%), tests_pri_-900: 1.72 (0.9%), tests_pri_-400: 20 (10.4%), check_bayes: 19 (9.6%), b_tokenize: 7 (3.7%), b_tok_get_all: 4.5 (2.3%), b_comp_prob: 2.2 (1.1%), b_tok_touch_all: 2.5 (1.3%), b_finish: 0.82 (0.4%), tests_pri_0: 128 (65.4%), tests_pri_500: 5.0 (2.5%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH net-next 7/6] ipv6: Add missing newline to __xfrm6_output_finish X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Wed, 24 Sep 2014 11:00:52 -0600) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add a newline between variable declarations and the code. Signed-off-by: "Eric W. Biederman" --- net/ipv6/xfrm6_output.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c index 335066a64b45..4cefda009f53 100644 --- a/net/ipv6/xfrm6_output.c +++ b/net/ipv6/xfrm6_output.c @@ -134,6 +134,7 @@ int xfrm6_output_finish(struct sock *sk, struct sk_buff *skb) static int __xfrm6_output_finish(struct net *net, struct sock *sk, struct sk_buff *skb) { struct xfrm_state *x = skb_dst(skb)->xfrm; + return x->outer_mode->afinfo->output_finish(sk, skb); }