Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e3a78b4 authored by Scott Feldman's avatar Scott Feldman Committed by David S. Miller
Browse files

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: default avatarScott Feldman <sfeldma@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e8e85cc5

drivers/net/ethernet/rocker/rocker.c

+2 −2
Original line number Diff line number Diff line
@@ -4295,7 +4295,7 @@ static int rocker_port_vlans_add(struct rocker_port *rocker_port, 
	u16 vid;

	int err;



	for (vid = vlan->vid_start; vid <= vlan->vid_end; vid++) {

	for (vid = vlan->vid_begin; vid <= vlan->vid_end; vid++) {

		err = rocker_port_vlan_add(rocker_port, trans,

					   vid, vlan->flags);

		if (err)
@@ -4378,7 +4378,7 @@ static int rocker_port_vlans_del(struct rocker_port *rocker_port, 
	u16 vid;

	int err;



	for (vid = vlan->vid_start; vid <= vlan->vid_end; vid++) {

	for (vid = vlan->vid_begin; vid <= vlan->vid_end; vid++) {

		err = rocker_port_vlan_del(rocker_port, vid, vlan->flags);

		if (err)

			return err;

include/net/switchdev.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct switchdev_obj { 
	union {

		struct switchdev_obj_vlan {		/* PORT_VLAN */

			u16 flags;

			u16 vid_start;

			u16 vid_begin;

			u16 vid_end;

		} vlan;

		struct switchdev_obj_ipv4_fib {		/* IPV4_FIB */

net/bridge/br_vlan.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

			},

		};

net/switchdev/switchdev.c

+6 −6
Original line number Diff line number Diff line
@@ -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)