Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Apr 2020 13:14:07 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r360304 - in stable: 10/sys/dev/ixl 11/sys/dev/ixl 12/sys/dev/ixl
Message-ID:  <202004251314.03PDE7qZ082353@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Sat Apr 25 13:14:06 2020
New Revision: 360304
URL: https://svnweb.freebsd.org/changeset/base/360304

Log:
  MFC r348445 (by lwhsu):
  
  Add the missing braces to fix the code not guarded by the if clause and has
  misleading indentation.  This is found by gcc -Wmisleading-indentation
  
  Approved by:	erj
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D20428

Modified:
  stable/10/sys/dev/ixl/i40e_common.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/dev/ixl/i40e_common.c
  stable/12/sys/dev/ixl/i40e_common.c
Directory Properties:
  stable/11/   (props changed)
  stable/12/   (props changed)

Modified: stable/10/sys/dev/ixl/i40e_common.c
==============================================================================
--- stable/10/sys/dev/ixl/i40e_common.c	Sat Apr 25 13:10:17 2020	(r360303)
+++ stable/10/sys/dev/ixl/i40e_common.c	Sat Apr 25 13:14:06 2020	(r360304)
@@ -374,13 +374,14 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug
  **/
 bool i40e_check_asq_alive(struct i40e_hw *hw)
 {
-	if (hw->aq.asq.len)
+	if (hw->aq.asq.len) {
 		if (!i40e_is_vf(hw))
 			return !!(rd32(hw, hw->aq.asq.len) &
 				I40E_PF_ATQLEN_ATQENABLE_MASK);
-		if (i40e_is_vf(hw))
+		else
 			return !!(rd32(hw, hw->aq.asq.len) &
 				I40E_VF_ATQLEN1_ATQENABLE_MASK);
+	}
 	return FALSE;
 }
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004251314.03PDE7qZ082353>