From patchwork Wed Jun 17 23:08:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 486018 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 8CBC3140129 for ; Thu, 18 Jun 2015 09:06:40 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=r7Xhn2gO; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753917AbbFQXGf (ORCPT ); Wed, 17 Jun 2015 19:06:35 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:34037 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753907AbbFQXGe (ORCPT ); Wed, 17 Jun 2015 19:06:34 -0400 Received: by pabvl15 with SMTP id vl15so569167pab.1 for ; Wed, 17 Jun 2015 16:06:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=vgYJ4E9XaWaWPQHWRCSxCFt+8S4tUGO+RWuyiUGTgdU=; b=r7Xhn2gO0RCRc/w7T8QvgvdlFBmSANHEquQRERGZZsiNA/xDUgdGeZSYaG2cowsVax Gi1n4emejMaKi4NHou3nukuGg2Ycg8I/lhbHZVsYnVxZWAQJL/KbO7ZoprMpZhNgPNS2 rMOIavTFOhmVbL5cF5q6xNtX65dpv708rmhTbzV0iFTYT+kJ9uBjunoP0vZ8JuUckXAp 2i95jkK/oFCQp7ZeYWk8s74UJQGSrX93NM31F12uwhCiRomBmBlG13YMifbhvrDnsiNV 7jWXCUCSAZvbGDh06FL4hb9BDH+cDNDZ+gD37TgQUr2BKBgKmspi8Cog/EmbQeYqYMW8 j+8g== X-Received: by 10.66.141.109 with SMTP id rn13mr15103706pab.127.1434582393602; Wed, 17 Jun 2015 16:06:33 -0700 (PDT) Received: from rocker1.rocker.net ([199.58.98.143]) by mx.google.com with ESMTPSA id k9sm5794844pbq.71.2015.06.17.16.06.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jun 2015 16:06:32 -0700 (PDT) From: sfeldma@gmail.com To: netdev@vger.kernel.org Cc: jiri@resnulli.us, sridhar.samudrala@intel.com Subject: [PATCH net-next] switchdev: fdb filter_dev is always NULL for self (device), so remove check Date: Wed, 17 Jun 2015 16:08:31 -0700 Message-Id: <1434582511-46290-1-git-send-email-sfeldma@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Scott Feldman Remove the filter_dev check when dumping fdb entries, otherwise dump returns empty list. filter_dev is always passed as NULL when dumping fdbs on SELF. We want the fdbs installed on the device to be listed in the dump. Signed-off-by: Scott Feldman Fixes: 45d4122c ("switchdev: add support for fdb add/del/dump via switchdev_port_obj ops") Acked-by: Sridhar Samudrala Acked-by: Jiri Pirko --- net/switchdev/switchdev.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index a5d0f8e..7dda437 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -657,7 +657,6 @@ struct switchdev_fdb_dump { struct switchdev_obj obj; struct sk_buff *skb; struct netlink_callback *cb; - struct net_device *filter_dev; int idx; }; @@ -670,14 +669,10 @@ static int switchdev_port_fdb_dump_cb(struct net_device *dev, u32 seq = dump->cb->nlh->nlmsg_seq; struct nlmsghdr *nlh; struct ndmsg *ndm; - struct net_device *master = netdev_master_upper_dev_get(dev); if (dump->idx < dump->cb->args[0]) goto skip; - if (master && dump->filter_dev != master) - goto skip; - nlh = nlmsg_put(dump->skb, portid, seq, RTM_NEWNEIGH, sizeof(*ndm), NLM_F_MULTI); if (!nlh) @@ -731,7 +726,6 @@ int switchdev_port_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb, }, .skb = skb, .cb = cb, - .filter_dev = filter_dev, .idx = idx, }; int err;