From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760581AbdAKVP7 (ORCPT ); Wed, 11 Jan 2017 16:15:59 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:61836 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753235AbdAKVPo (ORCPT ); Wed, 11 Jan 2017 16:15:44 -0500 From: Arnd Bergmann To: Saeed Mahameed , Hadar Hen Zion Cc: Or Gerlitz , "David S . Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH] [net] net/mlx5e: fix another -Wmaybe-uninitialized warning Date: Wed, 11 Jan 2017 22:14:51 +0100 Message-Id: <20170111211451.2705705-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:v/cCZaoIdLENo0pNpjatAthj+FdQbgWAa7Nr9rCUzcau9pfPih9 dtzqdcUfsXF3gF+3l73UVbWUim7Km2DdSo0cXwCkz1VvxL98ZkEUbc+Hun2NZ4EU4hSJpsL INI4NIEU82gjW4nMwtei8hTCAg974fj8+0ncSO5tF4rSx2dra/1h3hLb/H/oVEPdDC9+sU3 HiYZZltYMXynn+LcTPp1w== X-UI-Out-Filterresults: notjunk:1;V01:K0:Y96CuR75Mhw=:79iVydGSq2oVq39SAot8HI OPr5LK4lLj/SmArqTaCEXZLK5j/hcjzdSekZtP++F418myVou1lQ/8oBnw0FO6vwiy1Qpoyf1 ERVhd6o6840iCkfl7//2Wmht718+GiWw8jSiAaxHzu8auylStr+XXOwyiEy5NAFXswxS/Iw50 B9+tsJmQpPHD6QzhvCkeKNcciPm6q2raxIeC1y0RtWgvVb0QjSyYdWSFl1FyKyG54fbUjKxcW iYnj0iAFe2I9hsNn3PGmX6wQZHnt5ljQPNJ0P0w97yLhLwhxdwduckUgiLsU4qoeJd3ORMsdV kgLIyLpSMN7u8Xp2yWg05Rev0MWUwYJQNuK/G5O8zFaC/xvlnZUXuPQVbHdjQYiWIyVROFOfi D17OsprceREJAoEwJs7L//Rz1v8WvZqNml/3ZO1k/y1kJOAxAWSJV7XkNcS7qenmvGp2wrCL0 AQbsuGa0AUy3JTAUMJ/PYawJLmG0Oa0xpA0kfAXOVrsr/eVR1WyxURGlf26slimKZGMQ3UBYU LzK4U2B9mFyAQUKG5BCEMFPLkcyB1r0cMuNg6nkliMtuBxosAJABN5P5f4b9C0F1m8r9k98xD CvqgNjTn76yhbDYF+mKmf0loUssldHGfr4mzJVfHujk7/pq+/X9443HFBBQFmQd5fzsE7sxiF LRxtqb8ZPVOuRnlLnV8QM/umbGlRE9YAdr+RrGOO5nuISgTGx2y4+QyrUAdf6PrCnh1o= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As found by Olof's build bot, today's mainline kernel gained a harmless warning about a potential uninitalied variable reference: drivers/net/ethernet/mellanox/mlx5/core/en_tc.c: In function 'parse_tc_fdb_actions': drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:769:13: warning: 'out_dev' may be used uninitialized in this function [-Wmaybe-uninitialized] drivers/net/ethernet/mellanox/mlx5/core/en_tc.c:811:21: note: 'out_dev' was declared here This was introduced through the addition of an 'IS_ERR/PTR_ERR' pair that gcc is unfortunately unable to completely figure out. Replacing it with PTR_ERR_OR_ZERO makes the code more understandable to gcc so it no longer warns. Hadar Hen Zion already attempted to fix the warning earlier by adding fake initializations, but that ended up just making the code worse without fully addressing all warnings, so I'm reverting it now that it is no longer needed. In order to avoid pulling a variable declaration into the #ifdef, I'm removing it in favor of a more readable 'if()' statement here that has the same effect. Link: http://arm-soc.lixom.net/buildlogs/mainline/v4.10-rc3-98-gcff3b2c/ Fixes: a42485eb0ee4 ("net/mlx5e: TC ipv4 tunnel encap offload error flow fixes") Fixes: a757d108dc1a ("net/mlx5e: Fix kbuild warnings for uninitialized parameters") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index 118cea5..07d83835 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -666,14 +666,15 @@ static int mlx5e_route_lookup_ipv4(struct mlx5e_priv *priv, struct rtable *rt; struct neighbour *n = NULL; int ttl; + int ret; + + if (!IS_ENABLED(CONFIG_INET)) + return -EOPNOTSUPP; -#if IS_ENABLED(CONFIG_INET) rt = ip_route_output_key(dev_net(mirred_dev), fl4); - if (IS_ERR(rt)) - return PTR_ERR(rt); -#else - return -EOPNOTSUPP; -#endif + ret = PTR_ERR_OR_ZERO(rt); + if (ret) + return ret; if (!switchdev_port_same_parent_id(priv->netdev, rt->dst.dev)) { pr_warn("%s: can't offload, devices not on same HW e-switch\n", __func__); @@ -741,8 +742,8 @@ static int mlx5e_create_encap_header_ipv4(struct mlx5e_priv *priv, struct flowi4 fl4 = {}; char *encap_header; int encap_size; - __be32 saddr = 0; - int ttl = 0; + __be32 saddr; + int ttl; int err; encap_header = kzalloc(max_encap_size, GFP_KERNEL); -- 2.9.0