diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-09-03 16:22:17 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-09-03 16:24:01 (GMT) |
| commit | 2955fd003de43672391fe7ded87f61afad66b13a (patch) | |
| tree | e8a956c91c8ed54961b2c622184b371326618ce1 | |
| parent | d3d610407d4066c861dca79915c4b1bff4795e60 (diff) | |
| parent | 13001371708b5349425e072825748d3a6722fd9b (diff) | |
| download | libnl-2955fd003de43672391fe7ded87f61afad66b13a.zip libnl-2955fd003de43672391fe7ded87f61afad66b13a.tar.gz libnl-2955fd003de43672391fe7ded87f61afad66b13a.tar.bz2 | |
route/link: merge branch 'vlan-flags'
http://lists.infradead.org/pipermail/libnl/2015-September/001961.html
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | include/linux-private/linux/if_vlan.h | 1 | ||||
| -rw-r--r-- | lib/route/link/vlan.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux-private/linux/if_vlan.h b/include/linux-private/linux/if_vlan.h index 67affd1..bae71c5 100644 --- a/include/linux-private/linux/if_vlan.h +++ b/include/linux-private/linux/if_vlan.h @@ -33,6 +33,7 @@ enum vlan_flags { VLAN_FLAG_REORDER_HDR = 0x1, VLAN_FLAG_GVRP = 0x2, VLAN_FLAG_LOOSE_BINDING = 0x4, + VLAN_FLAG_MVRP = 0x8, }; enum vlan_name_types { diff --git a/lib/route/link/vlan.c b/lib/route/link/vlan.c index 9dc0d42..d266b7e 100644 --- a/lib/route/link/vlan.c +++ b/lib/route/link/vlan.c @@ -610,6 +610,9 @@ struct vlan_map *rtnl_link_vlan_get_egress_map(struct rtnl_link *link, static const struct trans_tbl vlan_flags[] = { __ADD(VLAN_FLAG_REORDER_HDR, reorder_hdr), + __ADD(VLAN_FLAG_GVRP, gvrp), + __ADD(VLAN_FLAG_LOOSE_BINDING, loose_binding), + __ADD(VLAN_FLAG_MVRP, mvrp), }; /** |