From patchwork Tue Sep 29 16:07:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Didelot X-Patchwork-Id: 523939 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 49CB31402B6 for ; Wed, 30 Sep 2015 02:07:56 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964801AbbI2QHu (ORCPT ); Tue, 29 Sep 2015 12:07:50 -0400 Received: from ip-208-88-110-44.savoirfairelinux.net ([208.88.110.44]:33790 "EHLO mail.savoirfairelinux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934581AbbI2QHo (ORCPT ); Tue, 29 Sep 2015 12:07:44 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 74891620A43; Tue, 29 Sep 2015 12:07:43 -0400 (EDT) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id gx3T_sRXso9O; Tue, 29 Sep 2015 12:07:40 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 1D50E620A4A; Tue, 29 Sep 2015 12:07:40 -0400 (EDT) X-Virus-Scanned: amavisd-new at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id fNydMyv4hG1X; Tue, 29 Sep 2015 12:07:39 -0400 (EDT) Received: from office-srv-01.mtl.sfl (office-srv-01.mtl.sfl [192.168.50.3]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 8682D62092E; Tue, 29 Sep 2015 12:07:39 -0400 (EDT) Received: from ketchup.mtl.sfl (unknown [192.168.50.220]) by office-srv-01.mtl.sfl (Postfix) with ESMTP id 83779412067; Tue, 29 Sep 2015 12:07:39 -0400 (EDT) From: Vivien Didelot To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com, "David S. Miller" , Scott Feldman , Jiri Pirko , Florian Fainelli , Andrew Lunn , Vivien Didelot Subject: [PATCH v2 net-next 2/6] net: switchdev: move dev in switchdev_fdb_dump Date: Tue, 29 Sep 2015 12:07:14 -0400 Message-Id: <1443542838-19234-3-git-send-email-vivien.didelot@savoirfairelinux.com> X-Mailer: git-send-email 2.6.0 In-Reply-To: <1443542838-19234-1-git-send-email-vivien.didelot@savoirfairelinux.com> References: <1443542838-19234-1-git-send-email-vivien.didelot@savoirfairelinux.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The FDB dump callback requires the related net_device so move it to the struct switchdev_fdb_dump superset instead of using a callback param. With this done, it'll be simpler to change the dump function signature. Signed-off-by: Vivien Didelot --- net/switchdev/switchdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 56d34ed..c0e2047 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -858,6 +858,7 @@ EXPORT_SYMBOL_GPL(switchdev_port_fdb_del); struct switchdev_fdb_dump { struct switchdev_obj obj; + struct net_device *dev; struct sk_buff *skb; struct netlink_callback *cb; int idx; @@ -887,7 +888,7 @@ static int switchdev_port_fdb_dump_cb(struct net_device *dev, ndm->ndm_pad2 = 0; ndm->ndm_flags = NTF_SELF; ndm->ndm_type = 0; - ndm->ndm_ifindex = dev->ifindex; + ndm->ndm_ifindex = dump->dev->ifindex; ndm->ndm_state = obj->u.fdb.ndm_state; if (nla_put(dump->skb, NDA_LLADDR, ETH_ALEN, obj->u.fdb.addr)) @@ -927,6 +928,7 @@ int switchdev_port_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb, .id = SWITCHDEV_OBJ_PORT_FDB, .cb = switchdev_port_fdb_dump_cb, }, + .dev = dev, .skb = skb, .cb = cb, .idx = idx,