diff options
| author | Stephen Hemminger <shemming@brocade.com> | 2015-12-17 17:21:53 -0800 |
|---|---|---|
| committer | Stephen Hemminger <shemming@brocade.com> | 2015-12-17 17:21:53 -0800 |
| commit | 741c20b024f5f51bf194435fc4d79f34ae5c5481 (patch) | |
| tree | 5f84db51bd26774f7180b30911c5dbe2e8d4de00 | |
| parent | 00a2a1748b03427310e5db4e2a6bd0676c0f4d1f (diff) | |
| download | android_external_iproute2-741c20b024f5f51bf194435fc4d79f34ae5c5481.tar.gz android_external_iproute2-741c20b024f5f51bf194435fc4d79f34ae5c5481.tar.bz2 android_external_iproute2-741c20b024f5f51bf194435fc4d79f34ae5c5481.zip | |
include: update kernel headers
Current headers for net-next
| -rw-r--r-- | include/linux/if_link.h | 3 | ||||
| -rw-r--r-- | include/linux/in6.h | 1 | ||||
| -rw-r--r-- | include/linux/rtnetlink.h | 1 | ||||
| -rw-r--r-- | include/linux/sock_diag.h | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/if_link.h b/include/linux/if_link.h index 5d206c7..c9ad487 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -460,6 +460,9 @@ enum { IFLA_GENEVE_PORT, /* destination port */ IFLA_GENEVE_COLLECT_METADATA, IFLA_GENEVE_REMOTE6, + IFLA_GENEVE_UDP_CSUM, + IFLA_GENEVE_UDP_ZERO_CSUM6_TX, + IFLA_GENEVE_UDP_ZERO_CSUM6_RX, __IFLA_GENEVE_MAX }; #define IFLA_GENEVE_MAX (__IFLA_GENEVE_MAX - 1) diff --git a/include/linux/in6.h b/include/linux/in6.h index 994f4c2..aa5b66d 100644 --- a/include/linux/in6.h +++ b/include/linux/in6.h @@ -196,6 +196,7 @@ struct in6_flowlabel_req { #define IPV6_IPSEC_POLICY 34 #define IPV6_XFRM_POLICY 35 +#define IPV6_HDRINCL 36 #endif /* diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 18c543a..6aaa2a3 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -311,6 +311,7 @@ enum rtattr_type_t { RTA_PREF, RTA_ENCAP_TYPE, RTA_ENCAP, + RTA_EXPIRES, __RTA_MAX }; diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h index 024e1f4..dafcb89 100644 --- a/include/linux/sock_diag.h +++ b/include/linux/sock_diag.h @@ -4,6 +4,7 @@ #include <linux/types.h> #define SOCK_DIAG_BY_FAMILY 20 +#define SOCK_DESTROY 21 struct sock_diag_req { __u8 sdiag_family; |