From patchwork Fri May 5 19:47:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98702 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292918qge; Fri, 5 May 2017 12:48:52 -0700 (PDT) X-Received: by 10.84.230.135 with SMTP id e7mr68501073plk.20.1494013732207; Fri, 05 May 2017 12:48:52 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.52; Fri, 05 May 2017 12:48:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755763AbdEETsu (ORCPT + 6 others); Fri, 5 May 2017 15:48:50 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:58629 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755483AbdEETse (ORCPT ); Fri, 5 May 2017 15:48:34 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MZKwe-1dKxmF1Knc-00KvK5; Fri, 05 May 2017 21:48:23 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann , "David S . Miller" , Greg Kroah-Hartman Subject: [PATCH 3.16-stable 49/87] net: caif: fix misleading indentation Date: Fri, 5 May 2017 21:47:07 +0200 Message-Id: <20170505194745.3627137-50-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:Ujycg6J6/WnxTv0PLM7OuuLXACjhuBL9Kn/dILU/UYE43qWLXVn Lbhw/YxV2x2d42pi8Dxw1bTIc4p/T0ukFYSSfjpwKi4f66Fd83uf/dAfu6FjVEg/FiG6KBB L5R60erwMBp1YlF8Nbyj/rlmoq6IM28S1o92nz2hw7/yhQGwI/onaMO+1Aq4hxkBo/mGUez +fsTF7V2zs6dE2137cxow== X-UI-Out-Filterresults: notjunk:1; V01:K0:qXc8secqP+A=:gumc0ntNdpPlxvks78xvVQ bYp7BE1cUrupKeUvTJ0GN4i9oGOQin+Ohm8LYSUv3qwUiGxfJtW1SmzxN5l/gQfLDYbU1ERIM Y/1GlFB5ptx3+2hLIPLcl1SarLdoITLkhVYuyyXG2Db8U4rcdErCL61znLXvx+6JSlPqWiIIZ i0O53PA9N1BIfCwm9rKc4nU6RlvN3MrQTks0SF0brl6LBdF1lZakxqRwwA1ZU2cyPv9yxmUGn M7Cv6B2mMOctilieKiUK/tdBi3CZIzEXXxJ9BHi+crpeENa2h/Rh9lgxAhzNoFQq53CETfAx4 sbLEAIkfgMhILZej5GUQujzeFfF747OJ+bBPZhNMvuhjMM0nb+uzCDSChC7aK+OkpfX87uvQi YUhZHGLUiXTDU8p9CVBbnZFS4Z39tSnuMpUH9LOzvEiX8jg/dPR5Q2ZZRGplEGGAgROG1jw3X ZaQahtRkVIYTy16i29Dw2hBfQBjp3gz3ziUQj/qpKgNwbTPHHeUBU1XJWnMVFINYho7SK8FXd YxTdbEIEBoDDMZn23sdSGZG9QlI7Z4f8mytmw48VQtaZ8AXM9JNzy7thwCUnr/PDQGp6V6+ts qnb3ee8qkCkVE3vphiv0sW0cFjtuFCBHTcFS5cV+/v+kDxA0zRiVNjrfv1RW+ZY21PhHsJaB6 qXJrrud+vkWOSDE/Yk60mGhTtxqhiktxR0KirlfeZ5wdNR6C4gsJY2wz+SqfZe/BMUls= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org commit 8e0cc8c326d99e41468c96fea9785ab78883a281 upstream. gcc points out code that is not indented the way it is interpreted: net/caif/cfpkt_skbuff.c: In function 'cfpkt_setlen': net/caif/cfpkt_skbuff.c:289:4: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation] return cfpkt_getlen(pkt); ^~~~~~ net/caif/cfpkt_skbuff.c:286:3: note: ...this 'else' clause, but it is not else ^~~~ It is clear from the context that not returning here would be a bug, as we'd end up passing a negative length into a function that takes a u16 length, so it is not missing curly braces here, and I'm assuming that the indentation is the only part that's wrong about it. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- net/caif/cfpkt_skbuff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/net/caif/cfpkt_skbuff.c b/net/caif/cfpkt_skbuff.c index 1be0b521ac49..5add8e75759d 100644 --- a/net/caif/cfpkt_skbuff.c +++ b/net/caif/cfpkt_skbuff.c @@ -286,7 +286,7 @@ int cfpkt_setlen(struct cfpkt *pkt, u16 len) else skb_trim(skb, len); - return cfpkt_getlen(pkt); + return cfpkt_getlen(pkt); } /* Need to expand SKB */