From patchwork Tue Jan 7 08:56:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 307559 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0CCFF2C00D4 for ; Tue, 7 Jan 2014 19:56:14 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756069AbaAGI4J (ORCPT ); Tue, 7 Jan 2014 03:56:09 -0500 Received: from mail-bk0-f49.google.com ([209.85.214.49]:42182 "EHLO mail-bk0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755804AbaAGI4I (ORCPT ); Tue, 7 Jan 2014 03:56:08 -0500 Received: by mail-bk0-f49.google.com with SMTP id my13so139037bkb.22 for ; Tue, 07 Jan 2014 00:56:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=QnswR1798gD8QSllaKTk/fDknPzB82dYJxBibJ2fLrI=; b=Z3xqbb+wHOuK16gMH8XNMb7NRF1+7oSkbrtEXdzLZ5SIqya1LATZCwKhL1Ju1HMGw6 bBPgNWp8SW34CJgnsDwNRlcGq2esrN760hJe9ktUpd/7XJGRJMZS6uhVwQcvDViXmyF+ F4vvvOC6M0gYhnLQBnISgd1ita4Rwpuu3eRVwHUQAOw18PwVhwIimbo+Ra9TJ+9tJjEu 152rOPHE2CelHqzzgwaoCqzcyIbVL6YligpQjJUlt6BHljS+bvjrBf2Gv4gGwKTFy+MD H2X9v4zcCzQkA6hQV2EKVVfLI2Bn9/WTmxnQIaKtQFtBUXyLsWIcIdAJykvEN1/Rz9ZB dNng== MIME-Version: 1.0 X-Received: by 10.205.68.136 with SMTP id xy8mr173996bkb.137.1389084967198; Tue, 07 Jan 2014 00:56:07 -0800 (PST) Received: by 10.204.74.130 with HTTP; Tue, 7 Jan 2014 00:56:07 -0800 (PST) Date: Tue, 7 Jan 2014 16:56:07 +0800 Message-ID: Subject: [PATCH -next] net/mlx4_en: fix error return code in mlx4_en_get_qp() From: Wei Yongjun To: amirv@mellanox.com, ogerlitz@mellanox.com, davem@davemloft.net Cc: yongjun_wei@trendmicro.com.cn, netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Yongjun Fix to return a negative error code from the error handling case instead of 0. Fixes: 837052d0ccc5 ('net/mlx4_en: Add netdev support for TCP/IP offloads of vxlan tunneling') Signed-off-by: Wei Yongjun --- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index 60b927e..fad4531 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -632,8 +632,9 @@ static int mlx4_en_get_qp(struct mlx4_en_priv *priv) if (err) goto steer_err; - if (mlx4_en_tunnel_steer_add(priv, priv->dev->dev_addr, *qpn, - &priv->tunnel_reg_id)) + err = mlx4_en_tunnel_steer_add(priv, priv->dev->dev_addr, *qpn, + &priv->tunnel_reg_id); + if (err) goto tunnel_err; entry = kmalloc(sizeof(*entry), GFP_KERNEL);