update headers files for net-next

Use sanitized headers from 4.0.0-rc3

diff --git a/include/linux/if_addr.h b/include/linux/if_addr.h
index cc375e42e8bbfc9f4683c36b3324b8534399ced7..2033adcf17a34cb0bce0c24ad47ba7d5cab21df8 100644 (file)
--- a/include/linux/if_addr.h
+++ b/include/linux/if_addr.h
@@ -50,6 +50,7 @@ enum {
 #define IFA_F_PERMANENT                0x80
 #define IFA_F_MANAGETEMPADDR   0x100
 #define IFA_F_NOPREFIXROUTE    0x200
+#define IFA_F_MCAUTOJOIN       0x400
 
 struct ifa_cacheinfo {
        __u32   ifa_prefered;

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 3450c3fbdc653533549f9ed2147559d1f14a1b4e..7c40db4f9c5c8a2997c648774c9430d58f1d47a8 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -245,6 +245,7 @@ enum {
        IFLA_BRPORT_UNICAST_FLOOD, /* flood unicast traffic */
        IFLA_BRPORT_PROXYARP,   /* proxy ARP */
        IFLA_BRPORT_LEARNING_SYNC, /* mac learning sync from device */
+       IFLA_BRPORT_PROXYARP_WIFI, /* proxy ARP for Wi-Fi */
        __IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 25731dfb3fcc2f331cbba3c8f415c75614c1f46d..bf08e76bf50525912360edbfe09b1e220f683e94 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -397,6 +397,8 @@ enum {
        TCA_BPF_CLASSID,
        TCA_BPF_OPS_LEN,
        TCA_BPF_OPS,
+       TCA_BPF_FD,
+       TCA_BPF_NAME,
        __TCA_BPF_MAX,
 };
 

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 3eb78105399be8c377591ee76af993e07e8d5226..28650a31d77f2a6727f6435175cd2ac6a6ec6f24 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -303,6 +303,9 @@ enum rtattr_type_t {
        RTA_TABLE,
        RTA_MARK,
        RTA_MFC_STATS,
+       RTA_VIA,
+       RTA_NEWDST,
+       RTA_PREF,
        __RTA_MAX
 };
 
@@ -332,6 +335,7 @@ struct rtnexthop {
 #define RTNH_F_DEAD            1       /* Nexthop is dead (used by multipath)  */
 #define RTNH_F_PERVASIVE       2       /* Do recursive gateway lookup  */
 #define RTNH_F_ONLINK          4       /* Gateway is forced on link    */
+#define RTNH_F_EXTERNAL                8       /* Route installed externally   */
 
 /* Macros to handle hexthops */
 
@@ -344,6 +348,12 @@ struct rtnexthop {
 #define RTNH_SPACE(len)        RTNH_ALIGN(RTNH_LENGTH(len))
 #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 */
 
 struct rta_cacheinfo {
@@ -621,6 +631,8 @@ enum rtnetlink_groups {
 #define RTNLGRP_IPV6_NETCONF   RTNLGRP_IPV6_NETCONF
        RTNLGRP_MDB,
 #define RTNLGRP_MDB            RTNLGRP_MDB
+       RTNLGRP_MPLS_ROUTE,
+#define RTNLGRP_MPLS_ROUTE     RTNLGRP_MPLS_ROUTE
        __RTNLGRP_MAX
 };
 #define RTNLGRP_MAX    (__RTNLGRP_MAX - 1)