aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorJamal Hadi Salim <jhs@mojatatu.com>2014-07-10 07:01:58 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-10 15:37:33 -0400
commit5d5eacb34c9e1fdc0a47b885d832eaa4de860dc7 (patch)
tree880d3849c474c2d307928b99d22f9a4354e1387a /net/core
parent69b4b7a4148e94a3fe7f06f72ee70113a6c61837 (diff)
bridge: fdb dumping takes a filter device
Dumping a bridge fdb dumps every fdb entry held. With this change we are going to filter on selected bridge port. Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/rtnetlink.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 27acaf7ff6d7..90a906e7ac26 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2517,6 +2517,7 @@ skip:
2517int ndo_dflt_fdb_dump(struct sk_buff *skb, 2517int ndo_dflt_fdb_dump(struct sk_buff *skb,
2518 struct netlink_callback *cb, 2518 struct netlink_callback *cb,
2519 struct net_device *dev, 2519 struct net_device *dev,
2520 struct net_device *filter_dev,
2520 int idx) 2521 int idx)
2521{ 2522{
2522 int err; 2523 int err;
@@ -2547,13 +2548,15 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)
2547 br_dev = netdev_master_upper_dev_get(dev); 2548 br_dev = netdev_master_upper_dev_get(dev);
2548 ops = br_dev->netdev_ops; 2549 ops = br_dev->netdev_ops;
2549 if (ops->ndo_fdb_dump) 2550 if (ops->ndo_fdb_dump)
2550 idx = ops->ndo_fdb_dump(skb, cb, dev, idx); 2551 idx = ops->ndo_fdb_dump(skb, cb, dev, NULL,
2552 idx);
2551 } 2553 }
2552 2554
2553 if (dev->netdev_ops->ndo_fdb_dump) 2555 if (dev->netdev_ops->ndo_fdb_dump)
2554 idx = dev->netdev_ops->ndo_fdb_dump(skb, cb, dev, idx); 2556 idx = dev->netdev_ops->ndo_fdb_dump(skb, cb, dev, NULL,
2557 idx);
2555 else 2558 else
2556 idx = ndo_dflt_fdb_dump(skb, cb, dev, idx); 2559 idx = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx);
2557 } 2560 }
2558 rcu_read_unlock(); 2561 rcu_read_unlock();
2559 2562