diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-23 13:56:32 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-23 13:56:32 (GMT) |
| commit | 06baa3d0fb8491b21d579d3220569730c01efacc (patch) | |
| tree | dc2b70efc634d14085fc8e2abe0050e7039dc7f7 /include/net/switchdev.h | |
| parent | e8e85cc5eb5701b935a06b5b3a03a8532946f969 (diff) | |
| parent | 7d4f8d871ab15bd50a5771382ca2c9355b38d73c (diff) | |
| download | linux-06baa3d0fb8491b21d579d3220569730c01efacc.tar.xz | |
Merge branch 'switchdev-vlan'
Scott Feldman says:
====================
switchdev; add VLAN support for port's bridge_getlink
One more missing piece of the puzzle. Add vlan dump support to switchdev
port's bridge_getlink. iproute2 "bridge vlan show" cmd already knows how
to show the vlans installed on the bridge and the device , but (until now)
no one implemented the port vlan part of the netlink PF_BRIDGE:RTM_GETLINK
msg. Before this patch, "bridge vlan show":
$ bridge -c vlan show
port vlan ids
sw1p1 30-34 << bridge side vlans
57
sw1p1 << device side vlans (missing)
sw1p2 57
sw1p2
sw1p3
sw1p4
br0 None
(When the port is bridged, the output repeats the vlan list for the vlans
on the bridge side of the port and the vlans on the device side of the
port. The listing above show no vlans for the device side even though they
are installed).
After this patch:
$ bridge -c vlan show
port vlan ids
sw1p1 30-34 << bridge side vlan
57
sw1p1 30-34 << device side vlans
57
3840 PVID
sw1p2 57
sw1p2 57
3840 PVID
sw1p3 3842 PVID
sw1p4 3843 PVID
br0 None
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/switchdev.h')
| -rw-r--r-- | include/net/switchdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/switchdev.h b/include/net/switchdev.h index 437f8fe..d5671f1 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -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 */ |