From patchwork Thu Sep 3 12:04:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 514016 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 A38B514028F for ; Thu, 3 Sep 2015 22:04:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754124AbbICMEV (ORCPT ); Thu, 3 Sep 2015 08:04:21 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:36096 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754003AbbICMEU (ORCPT ); Thu, 3 Sep 2015 08:04:20 -0400 Received: by wibz8 with SMTP id z8so96419461wib.1 for ; Thu, 03 Sep 2015 05:04:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=QCHNR3wVkRb9RvMihQs+72V6OuhoLWvwL7QxVDsfYYY=; b=Vg25YCATXVzni/RSF9Q+VI1IoU3TaKTH0AaOKZIvDgw0uXxEEZDMyjDlTpvLpCaVNH ZhiVEMCZwmg25o+KxMHhZKHk8S1yruXfxdflYQUiiDekXLVEBKYAkss1rggj/Z7YoRu3 wJf7HO110GT9lt8go9RIt4xBAX2LHxuTxqbtf3gq8IVMSWLmGrqaTAvKaxjq9GHPrHFg Q2NDGF1d3DoDsbO7tUydSc2WEVCN80fH+iDY+2i6BSdzIxqIG/ug6iq1mn3GB6oIhCdq KNZI09rzOLg58AfaTwsX6Qu4tVT+BZz8fcMSxD/ffmTTqOwIdqxzFrz/aqevFcBjV7FW IRFw== X-Gm-Message-State: ALoCoQmpheDiOsDijb30AkQpYA++s0GtLlxO96TEPaikBnZuADKGt1ehL7uZJOapdJcxt8j67oHY X-Received: by 10.194.81.169 with SMTP id b9mr17957940wjy.3.1441281859161; Thu, 03 Sep 2015 05:04:19 -0700 (PDT) Received: from localhost (ip-94-113-120-24.net.upcbroadband.cz. [94.113.120.24]) by smtp.gmail.com with ESMTPSA id ne7sm8657608wic.12.2015.09.03.05.04.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Sep 2015 05:04:18 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, idosch@mellanox.com, eladr@mellanox.com, sridhar.samudrala@intel.com, sfeldma@gmail.com, Jiri Pirko Subject: [patch net] switchdev: fix return value of switchdev_port_fdb_dump in case of error Date: Thu, 3 Sep 2015 14:04:17 +0200 Message-Id: <1441281857-613-1-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.9.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko switchdev_port_fdb_dump is used as .ndo_fdb_dump. Its return value is idx, so we cannot return errval. Fixes: 45d4122ca7cd ("switchdev: add support for fdb add/del/dump via switchdev_port_obj ops.") Signed-off-by: Jiri Pirko Acked-by: Sridhar Samudrala Acked-by: Scott Feldman --- net/switchdev/switchdev.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 16c1c43..fda38f8 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -853,12 +853,8 @@ int switchdev_port_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb, .cb = cb, .idx = idx, }; - int err; - - err = switchdev_port_obj_dump(dev, &dump.obj); - if (err) - return err; + switchdev_port_obj_dump(dev, &dump.obj); return dump.idx; } EXPORT_SYMBOL_GPL(switchdev_port_fdb_dump);