Commit 61333d24 authored by Stephen Hemminger's avatar Stephen Hemminger

update headers files for net-next

Use sanitized headers from 4.0.0-rc3
parent 51cf3675
...@@ -50,6 +50,7 @@ enum { ...@@ -50,6 +50,7 @@ enum {
#define IFA_F_PERMANENT 0x80 #define IFA_F_PERMANENT 0x80
#define IFA_F_MANAGETEMPADDR 0x100 #define IFA_F_MANAGETEMPADDR 0x100
#define IFA_F_NOPREFIXROUTE 0x200 #define IFA_F_NOPREFIXROUTE 0x200
#define IFA_F_MCAUTOJOIN 0x400
struct ifa_cacheinfo { struct ifa_cacheinfo {
__u32 ifa_prefered; __u32 ifa_prefered;
......
...@@ -245,6 +245,7 @@ enum { ...@@ -245,6 +245,7 @@ enum {
IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */ IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */
IFLA_BRPORT_PROXYARP, /* proxy ARP */ IFLA_BRPORT_PROXYARP, /* proxy ARP */
IFLA_BRPORT_LEARNING_SYNC, /* mac learning sync from device */ IFLA_BRPORT_LEARNING_SYNC, /* mac learning sync from device */
IFLA_BRPORT_PROXYARP_WIFI, /* proxy ARP for Wi-Fi */
__IFLA_BRPORT_MAX __IFLA_BRPORT_MAX
}; };
#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
......
...@@ -397,6 +397,8 @@ enum { ...@@ -397,6 +397,8 @@ enum {
TCA_BPF_CLASSID, TCA_BPF_CLASSID,
TCA_BPF_OPS_LEN, TCA_BPF_OPS_LEN,
TCA_BPF_OPS, TCA_BPF_OPS,
TCA_BPF_FD,
TCA_BPF_NAME,
__TCA_BPF_MAX, __TCA_BPF_MAX,
}; };
......
...@@ -303,6 +303,9 @@ enum rtattr_type_t { ...@@ -303,6 +303,9 @@ enum rtattr_type_t {
RTA_TABLE, RTA_TABLE,
RTA_MARK, RTA_MARK,
RTA_MFC_STATS, RTA_MFC_STATS,
RTA_VIA,
RTA_NEWDST,
RTA_PREF,
__RTA_MAX __RTA_MAX
}; };
...@@ -332,6 +335,7 @@ struct rtnexthop { ...@@ -332,6 +335,7 @@ struct rtnexthop {
#define RTNH_F_DEAD 1 /* Nexthop is dead (used by multipath) */ #define RTNH_F_DEAD 1 /* Nexthop is dead (used by multipath) */
#define RTNH_F_PERVASIVE 2 /* Do recursive gateway lookup */ #define RTNH_F_PERVASIVE 2 /* Do recursive gateway lookup */
#define RTNH_F_ONLINK 4 /* Gateway is forced on link */ #define RTNH_F_ONLINK 4 /* Gateway is forced on link */
#define RTNH_F_EXTERNAL 8 /* Route installed externally */
/* Macros to handle hexthops */ /* Macros to handle hexthops */
...@@ -344,6 +348,12 @@ struct rtnexthop { ...@@ -344,6 +348,12 @@ struct rtnexthop {
#define RTNH_SPACE(len) RTNH_ALIGN(RTNH_LENGTH(len)) #define RTNH_SPACE(len) RTNH_ALIGN(RTNH_LENGTH(len))
#define RTNH_DATA(rtnh) ((struct rtattr*)(((char*)(rtnh)) + RTNH_LENGTH(0))) #define RTNH_DATA(rtnh) ((struct rtattr*)(((char*)(rtnh)) + RTNH_LENGTH(0)))
/* RTA_VIA */
struct rtvia {
__kernel_sa_family_t rtvia_family;
__u8 rtvia_addr[0];
};
/* RTM_CACHEINFO */ /* RTM_CACHEINFO */
struct rta_cacheinfo { struct rta_cacheinfo {
...@@ -621,6 +631,8 @@ enum rtnetlink_groups { ...@@ -621,6 +631,8 @@ enum rtnetlink_groups {
#define RTNLGRP_IPV6_NETCONF RTNLGRP_IPV6_NETCONF #define RTNLGRP_IPV6_NETCONF RTNLGRP_IPV6_NETCONF
RTNLGRP_MDB, RTNLGRP_MDB,
#define RTNLGRP_MDB RTNLGRP_MDB #define RTNLGRP_MDB RTNLGRP_MDB
RTNLGRP_MPLS_ROUTE,
#define RTNLGRP_MPLS_ROUTE RTNLGRP_MPLS_ROUTE
__RTNLGRP_MAX __RTNLGRP_MAX
}; };
#define RTNLGRP_MAX (__RTNLGRP_MAX - 1) #define RTNLGRP_MAX (__RTNLGRP_MAX - 1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment