From patchwork Fri Apr 29 17:44:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 100873 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp919378qge; Fri, 29 Apr 2016 10:44:42 -0700 (PDT) X-Received: by 10.66.250.132 with SMTP id zc4mr31265307pac.130.1461951882049; Fri, 29 Apr 2016 10:44:42 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zz12si23455281pab.3.2016.04.29.10.44.41; Fri, 29 Apr 2016 10:44:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752368AbcD2Rok (ORCPT + 29 others); Fri, 29 Apr 2016 13:44:40 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:55699 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750714AbcD2Roi (ORCPT ); Fri, 29 Apr 2016 13:44:38 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0MHYCK-1azUFZ0yGy-003Ink; Fri, 29 Apr 2016 19:44:25 +0200 From: Arnd Bergmann To: Jeff Kirsher Cc: Arnd Bergmann , Jesse Brandeburg , Shannon Nelson , Carolyn Wyborny , Don Skidmore , Bruce Allan , John Ronciak , Mitch Williams , Anjali Singhai Jain , Greg Rose , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] i40e: fix misleading indentation Date: Fri, 29 Apr 2016 19:44:05 +0200 Message-Id: <1461951855-2038011-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:ibwgAax0uK5taTbKV/Gu3F65Ti1fty5Nt0J8Zp4c7qr2S9f20Vb OJWXwJL5wVt9yJQ1AEwcbl5J5CcXSXtTjKm6MqUgcyOM/a39pFJVMchAhAAZG+pknbYXJBd 9nLob+WgwucGxs6sjksigjuEigchtq4cTXV92ujN5EylavFpZGp2SGyq7yjxyZERyKXeMtc EcgZlulFSygadO6Nj/1FA== X-UI-Out-Filterresults: notjunk:1; V01:K0:OkHH82tMlO0=:QYSSc4q8Y3+7H+VH3m0a0s h35fwJcYvHAKMDF/uAtCuepRteoIaBbljWi9AcnANb1cfwOngniTLoe2sU7Ux2mOUieFkD+G/ p8nj0zByHagk9XhRFt5nToPU7xEGh0H/TrVw6lfn5CHxZnui/+LB1BTxT0Xe+o4lnX9rPKaws DidWrsE9YHL3ks3HR5NEu4udbMsAk/yYGqklQ2+OGq/rJAskscxu9LCHLK1QLKeiKwVMOxV9N VRxFDaOVcry2RRhsOLUvKZR35NIu7aSAFKb4JL7aNbXMoDEG19ai8/YGoXGjkzMMixI1lMPGN NP1/aXStgxrNJc18CiHHxvv13J8uki4l+W1m1nVRBp2vSyD9Y2dLr99Sa7qvOqkNqdWMZRAka OuWo+VCLDl+1Ob9E+1xcKp+Z8STnu0OnBO/G2ry6M8I7qZejmjk5btsXz3IYjftPKcSVSQeKA 7PnsNyQdExHNTj42ohZnhF0VX+f4VOLz0lN9qXdlH7FzH4ys6gmf51BF3/OL8jlLqRIpJTJqt I+L68hDAHQgLgCmvI2dKmKyAAjoLVvmN6licvnhU51C6gKoMY9nQGdPeG0AxjvBPbzsEqtMX1 RvFS+6U3aD4pRGrbsGwJ/eIMfN9xq+ef8wuJP2AtuM8IleozKYyLp8qmhLQ75fJ6uEuGPvO2s gPpVGVGKztPbLHZzeEUocOF4wKP4GVbT9H56647C2q0h6O3PgmFEcnijO/AiiM0ZUf8E= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Newly added code in i40e_vc_config_promiscuous_mode_msg() is indented in a way that gcc rightly complains about: drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c: In function 'i40e_vc_config_promiscuous_mode_msg': drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c:1543:4: error: this 'if' clause does not guard... [-Werror=misleading-indentation] if (f->vlan >= 0 && f->vlan <= I40E_MAX_VLANID) ^~ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c:1550:5: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if' aq_err = pf->hw.aq.asq_last_status; >From the context, it looks like the aq_err assignment was meant to be inside of the conditional expression, so I'm adding the appropriate curly braces now. Signed-off-by: Arnd Bergmann Fixes: 5676a8b9cd9a ("i40e: Add VF promiscuous mode driver support") --- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.0 diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c index c226c2dad247..30f9cc404707 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c @@ -1540,7 +1540,7 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf, } else if (i40e_getnum_vf_vsi_vlan_filters(vsi)) { list_for_each_entry(f, &vsi->mac_filter_list, list) { aq_ret = 0; - if (f->vlan >= 0 && f->vlan <= I40E_MAX_VLANID) + if (f->vlan >= 0 && f->vlan <= I40E_MAX_VLANID) { aq_ret = i40e_aq_set_vsi_uc_promisc_on_vlan(hw, vsi->seid, @@ -1548,6 +1548,7 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf, f->vlan, NULL); aq_err = pf->hw.aq.asq_last_status; + } if (aq_ret) dev_err(&pf->pdev->dev, "Could not add VLAN %d to Unicast promiscuous domain err %s aq_err %s\n",