4 files changed, 45 insertions, 0 deletions

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 04c0e7a5d484..80394e8dc3a3 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -314,6 +314,8 @@ enum {
         IFLA_VXLAN_L2MISS,
         IFLA_VXLAN_L3MISS,
         IFLA_VXLAN_PORT,        /* destination port */
+        IFLA_VXLAN_GROUP6,
+        IFLA_VXLAN_LOCAL6,
         __IFLA_VXLAN_MAX
 };
 #define IFLA_VXLAN_MAX  (__IFLA_VXLAN_MAX - 1)
diff --git a/include/uapi/linux/if_packet.h b/include/uapi/linux/if_packet.h
index b950c02030c0..dbf06667394b 100644
--- a/include/uapi/linux/if_packet.h
+++ b/include/uapi/linux/if_packet.h
@@ -56,6 +56,7 @@ struct sockaddr_ll {
 #define PACKET_FANOUT_LB                1
 #define PACKET_FANOUT_CPU               2
 #define PACKET_FANOUT_ROLLOVER          3
+#define PACKET_FANOUT_RND               4
 #define PACKET_FANOUT_FLAG_ROLLOVER     0x1000
 #define PACKET_FANOUT_FLAG_DEFRAG       0x8000
 
diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h
index d07ac6903e59..593b0e32d956 100644
--- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h
@@ -162,6 +162,7 @@ enum {
         DEVCONF_NDISC_NOTIFY,
         DEVCONF_MLDV1_UNSOLICITED_REPORT_INTERVAL,
         DEVCONF_MLDV2_UNSOLICITED_REPORT_INTERVAL,
+        DEVCONF_SUPPRESS_FRAG_NDISC,
         DEVCONF_MAX
 };
 
diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index 09d62b9228ff..9b829134d422 100644
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -744,4 +744,45 @@ struct tc_fq_codel_xstats {
         };
 };
 
+/* FQ */
+
+enum {
+        TCA_FQ_UNSPEC,
+
+        TCA_FQ_PLIMIT,          /* limit of total number of packets in queue */
+
+        TCA_FQ_FLOW_PLIMIT,     /* limit of packets per flow */
+
+        TCA_FQ_QUANTUM,         /* RR quantum */
+
+        TCA_FQ_INITIAL_QUANTUM,         /* RR quantum for new flow */
+
+        TCA_FQ_RATE_ENABLE,     /* enable/disable rate limiting */
+
+        TCA_FQ_FLOW_DEFAULT_RATE,/* for sockets with unspecified sk_rate,
+                                  * use the following rate
+                                  */
+
+        TCA_FQ_FLOW_MAX_RATE,   /* per flow max rate */
+
+        TCA_FQ_BUCKETS_LOG,     /* log2(number of buckets) */
+        __TCA_FQ_MAX
+};
+
+#define TCA_FQ_MAX      (__TCA_FQ_MAX - 1)
+
+struct tc_fq_qd_stats {
+        __u64   gc_flows;
+        __u64   highprio_packets;
+        __u64   tcp_retrans;
+        __u64   throttled;
+        __u64   flows_plimit;
+        __u64   pkts_too_long;
+        __u64   allocation_errors;
+        __s64   time_next_delayed_flow;
+        __u32   flows;
+        __u32   inactive_flows;
+        __u32   throttled_flows;
+        __u32   pad;
+};
 #endif