switchdev: rename vlan vid_start to vid_begin

Use vid_begin/end to be consistent with BRIDGE_VLAN_INFO_RANGE_BEGIN/END.

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 8 insertions, 8 deletions

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 17fc358a5432..574feea6a8cc 100644
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -54,7 +54,7 @@ static int __vlan_vid_add(struct net_device *dev, struct net_bridge *br,
                         .id = SWITCHDEV_OBJ_PORT_VLAN,
                         .u.vlan = {
                                 .flags = flags,
-                                .vid_start = vid,
+                                .vid_begin = vid,
                                 .vid_end = vid,
                         },
                 };
@@ -132,7 +132,7 @@ static void __vlan_vid_del(struct net_device *dev, struct net_bridge *br,
                 struct switchdev_obj vlan_obj = {
                         .id = SWITCHDEV_OBJ_PORT_VLAN,
                         .u.vlan = {
-                                .vid_start = vid,
+                                .vid_begin = vid,
                                 .vid_end = vid,
                         },
                 };
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index c29f2327f2e6..448d9199cea2 100644
--- 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)