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: 616925 X-Patchwork-Delegate: jeffrey.t.kirsher@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 3qxLgK6LnKz9t3p for ; Sat, 30 Apr 2016 03:44:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D3D2E91E69; Fri, 29 Apr 2016 17:44:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wtg2J3Mo2a9l; Fri, 29 Apr 2016 17:44:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 349E591E6A; Fri, 29 Apr 2016 17:44:44 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C18891C0FD0 for ; Fri, 29 Apr 2016 17:44:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B9B3691E75 for ; Fri, 29 Apr 2016 17:44:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2+lAMpvp-9nF for ; Fri, 29 Apr 2016 17:44:41 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.75]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3B36591E69 for ; Fri, 29 Apr 2016 17:44:40 +0000 (UTC) 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 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= Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org Subject: [Intel-wired-lan] [PATCH] i40e: fix misleading indentation X-BeenThere: intel-wired-lan@lists.osuosl.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-wired-lan-bounces@lists.osuosl.org Sender: "Intel-wired-lan" 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") Tested-by: Andrew Bowers --- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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",