projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
include
/
uapi
/
linux
/
if_link.h
diff --git
a/include/uapi/linux/if_link.h
b/include/uapi/linux/if_link.h
index 6b35c4211f6530e561bce51a7f68b317578a7790..e3163544f3391be88ce4a98b1673a763d4e304c9 100644
(file)
--- a/
include/uapi/linux/if_link.h
+++ b/
include/uapi/linux/if_link.h
@@
-250,6
+250,7
@@
enum {
IFLA_VLAN_FLAGS,
IFLA_VLAN_EGRESS_QOS,
IFLA_VLAN_INGRESS_QOS,
+ IFLA_VLAN_PROTOCOL,
__IFLA_VLAN_MAX,
};
@@
-296,7
+297,7
@@
enum macvlan_mode {
enum {
IFLA_VXLAN_UNSPEC,
IFLA_VXLAN_ID,
- IFLA_VXLAN_
GROUP
,
+ IFLA_VXLAN_
REMOTE
,
IFLA_VXLAN_LINK,
IFLA_VXLAN_LOCAL,
IFLA_VXLAN_TTL,