aboutsummaryrefslogtreecommitdiffstats
path: root/net/switchdev
diff options
context:
space:
mode:
authorScott Feldman <sfeldma@gmail.com>2015-06-22 03:27:16 -0400
committerDavid S. Miller <davem@davemloft.net>2015-06-23 09:56:18 -0400
commit3e3a78b49508e58f798cf519876bbb9ca0f931af (patch)
tree3a3ad7b5414fcbae12140975ba27f820b5c4643f /net/switchdev
parente8e85cc5eb5701b935a06b5b3a03a8532946f969 (diff)
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>
Diffstat (limited to 'net/switchdev')
-rw-r--r--net/switchdev/switchdev.c12
1 files changed, 6 insertions, 6 deletions
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,
510 vinfo = nla_data(attr); 510 vinfo = nla_data(attr);
511 vlan->flags = vinfo->flags; 511 vlan->flags = vinfo->flags;
512 if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) { 512 if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) {
513 if (vlan->vid_start) 513 if (vlan->vid_begin)
514 return -EINVAL; 514 return -EINVAL;
515 vlan->vid_start = vinfo->vid; 515 vlan->vid_begin = vinfo->vid;
516 } else if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_END) { 516 } else if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_END) {
517 if (!vlan->vid_start) 517 if (!vlan->vid_begin)
518 return -EINVAL; 518 return -EINVAL;
519 vlan->vid_end = vinfo->vid; 519 vlan->vid_end = vinfo->vid;
520 if (vlan->vid_end <= vlan->vid_start) 520 if (vlan->vid_end <= vlan->vid_begin)
521 return -EINVAL; 521 return -EINVAL;
522 err = f(dev, &obj); 522 err = f(dev, &obj);
523 if (err) 523 if (err)
524 return err; 524 return err;
525 memset(vlan, 0, sizeof(*vlan)); 525 memset(vlan, 0, sizeof(*vlan));
526 } else { 526 } else {
527 if (vlan->vid_start) 527 if (vlan->vid_begin)
528 return -EINVAL; 528 return -EINVAL;
529 vlan->vid_start = vinfo->vid; 529 vlan->vid_begin = vinfo->vid;
530 vlan->vid_end = vinfo->vid; 530 vlan->vid_end = vinfo->vid;
531 err = f(dev, &obj); 531 err = f(dev, &obj);
532 if (err) 532 if (err)