switchdev: rename vlan vid_start to vid_begin

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

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 658bc3ac80089da1fe676c82ff591dd3bfdbb3be..448d9199cea2718e0d4b57aa19debd93ae2ed684 100644 (file)
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -510,23 +510,23 @@ static int switchdev_port_br_afspec(struct net_device *dev,
                vinfo = nla_data(attr);
                vlan->flags = vinfo->flags;
                if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) {
-                       if (vlan->vid_start)
+                       if (vlan->vid_begin)
                                return -EINVAL;
-                       vlan->vid_start = vinfo->vid;
+                       vlan->vid_begin = vinfo->vid;
                } else if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_END) {
-                       if (!vlan->vid_start)
+                       if (!vlan->vid_begin)
                                return -EINVAL;
                        vlan->vid_end = vinfo->vid;
-                       if (vlan->vid_end <= vlan->vid_start)
+                       if (vlan->vid_end <= vlan->vid_begin)
                                return -EINVAL;
                        err = f(dev, &obj);
                        if (err)
                                return err;
                        memset(vlan, 0, sizeof(*vlan));
                } else {
-                       if (vlan->vid_start)
+                       if (vlan->vid_begin)
                                return -EINVAL;
-                       vlan->vid_start = vinfo->vid;
+                       vlan->vid_begin = vinfo->vid;
                        vlan->vid_end = vinfo->vid;
                        err = f(dev, &obj);
                        if (err)
@@ -656,7 +656,6 @@ struct switchdev_fdb_dump {
        struct switchdev_obj obj;
        struct sk_buff *skb;
        struct netlink_callback *cb;
-       struct net_device *filter_dev;
        int idx;
 };
 
@@ -669,14 +668,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)
@@ -730,7 +725,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;