Merge remote-tracking branch 'regmap/for-next'

[deliverable/linux.git] / net / switchdev / switchdev.c

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index a5fc9dd24aa9101eb80478f31a78d5fc6a278bd0..10b819308439cb6f63edc5d4c8f75dae2f06df1b 100644 (file)
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -1042,7 +1042,7 @@ static int switchdev_port_fdb_dump_cb(struct switchdev_obj *obj)
        struct nlmsghdr *nlh;
        struct ndmsg *ndm;
 
-       if (dump->idx < dump->cb->args[0])
+       if (dump->idx < dump->cb->args[2])
                goto skip;
 
        nlh = nlmsg_put(dump->skb, portid, seq, RTM_NEWNEIGH,
@@ -1089,7 +1089,7 @@ nla_put_failure:
  */
 int switchdev_port_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
                            struct net_device *dev,
-                           struct net_device *filter_dev, int idx)
+                           struct net_device *filter_dev, int *idx)
 {
        struct switchdev_fdb_dump dump = {
                .fdb.obj.orig_dev = dev,
@@ -1097,14 +1097,14 @@ int switchdev_port_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
                .dev = dev,
                .skb = skb,
                .cb = cb,
-               .idx = idx,
+               .idx = *idx,
        };
        int err;
 
        err = switchdev_port_obj_dump(dev, &dump.fdb.obj,
                                      switchdev_port_fdb_dump_cb);
-       cb->args[1] = err;
-       return dump.idx;
+       *idx = dump.idx;
+       return err;
 }
 EXPORT_SYMBOL_GPL(switchdev_port_fdb_dump);
 
@@ -1292,12 +1292,10 @@ bool switchdev_port_same_parent_id(struct net_device *a,
        struct switchdev_attr a_attr = {
                .orig_dev = a,
                .id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,
-               .flags = SWITCHDEV_F_NO_RECURSE,
        };
        struct switchdev_attr b_attr = {
                .orig_dev = b,
                .id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,
-               .flags = SWITCHDEV_F_NO_RECURSE,
        };
 
        if (switchdev_port_attr_get(a, &a_attr) ||
@@ -1306,89 +1304,4 @@ bool switchdev_port_same_parent_id(struct net_device *a,
 
        return netdev_phys_item_id_same(&a_attr.u.ppid, &b_attr.u.ppid);
 }
-
-static u32 switchdev_port_fwd_mark_get(struct net_device *dev,
-                                      struct net_device *group_dev)
-{
-       struct net_device *lower_dev;
-       struct list_head *iter;
-
-       netdev_for_each_lower_dev(group_dev, lower_dev, iter) {
-               if (lower_dev == dev)
-                       continue;
-               if (switchdev_port_same_parent_id(dev, lower_dev))
-                       return lower_dev->offload_fwd_mark;
-               return switchdev_port_fwd_mark_get(dev, lower_dev);
-       }
-
-       return dev->ifindex;
-}
 EXPORT_SYMBOL_GPL(switchdev_port_same_parent_id);
-
-static void switchdev_port_fwd_mark_reset(struct net_device *group_dev,
-                                         u32 old_mark, u32 *reset_mark)
-{
-       struct net_device *lower_dev;
-       struct list_head *iter;
-
-       netdev_for_each_lower_dev(group_dev, lower_dev, iter) {
-               if (lower_dev->offload_fwd_mark == old_mark) {
-                       if (!*reset_mark)
-                               *reset_mark = lower_dev->ifindex;
-                       lower_dev->offload_fwd_mark = *reset_mark;
-               }
-               switchdev_port_fwd_mark_reset(lower_dev, old_mark, reset_mark);
-       }
-}
-
-/**
- *     switchdev_port_fwd_mark_set - Set port offload forwarding mark
- *
- *     @dev: port device
- *     @group_dev: containing device
- *     @joining: true if dev is joining group; false if leaving group
- *
- *     An ungrouped port's offload mark is just its ifindex.  A grouped
- *     port's (member of a bridge, for example) offload mark is the ifindex
- *     of one of the ports in the group with the same parent (switch) ID.
- *     Ports on the same device in the same group will have the same mark.
- *
- *     Example:
- *
- *             br0             ifindex=9
- *               sw1p1         ifindex=2       mark=2
- *               sw1p2         ifindex=3       mark=2
- *               sw2p1         ifindex=4       mark=5
- *               sw2p2         ifindex=5       mark=5
- *
- *     If sw2p2 leaves the bridge, we'll have:
- *
- *             br0             ifindex=9
- *               sw1p1         ifindex=2       mark=2
- *               sw1p2         ifindex=3       mark=2
- *               sw2p1         ifindex=4       mark=4
- *             sw2p2           ifindex=5       mark=5
- */
-void switchdev_port_fwd_mark_set(struct net_device *dev,
-                                struct net_device *group_dev,
-                                bool joining)
-{
-       u32 mark = dev->ifindex;
-       u32 reset_mark = 0;
-
-       if (group_dev) {
-               ASSERT_RTNL();
-               if (joining)
-                       mark = switchdev_port_fwd_mark_get(dev, group_dev);
-               else if (dev->offload_fwd_mark == mark)
-                       /* Ohoh, this port was the mark reference port,
-                        * but it's leaving the group, so reset the
-                        * mark for the remaining ports in the group.
-                        */
-                       switchdev_port_fwd_mark_reset(group_dev, mark,
-                                                     &reset_mark);
-       }
-
-       dev->offload_fwd_mark = mark;
-}
-EXPORT_SYMBOL_GPL(switchdev_port_fwd_mark_set);