netfilter: fix nf_queue handling

[cascardo/linux.git] / include / uapi / linux / inet_diag.h

diff --git a/include/uapi/linux/inet_diag.h b/include/uapi/linux/inet_diag.h
index abbd1dc..509cd96 100644 (file)
--- a/include/uapi/linux/inet_diag.h
+++ b/include/uapi/linux/inet_diag.h
@@ -73,6 +73,7 @@ enum {
        INET_DIAG_BC_S_COND,
        INET_DIAG_BC_D_COND,
        INET_DIAG_BC_DEV_COND,   /* u32 ifindex */
+       INET_DIAG_BC_MARK_COND,
 };
 
 struct inet_diag_hostcond {
@@ -82,6 +83,11 @@ struct inet_diag_hostcond {
        __be32  addr[0];
 };
 
+struct inet_diag_markcond {
+       __u32 mark;
+       __u32 mask;
+};
+
 /* Base info structure. It contains socket identity (addrs/ports/cookie)
  * and, alas, the information shown by netstat. */
 struct inet_diag_msg {
@@ -117,6 +123,8 @@ enum {
        INET_DIAG_LOCALS,
        INET_DIAG_PEERS,
        INET_DIAG_PAD,
+       INET_DIAG_MARK,
+       INET_DIAG_BBRINFO,
        __INET_DIAG_MAX,
 };
 
@@ -150,8 +158,20 @@ struct tcp_dctcp_info {
        __u32   dctcp_ab_tot;
 };
 
+/* INET_DIAG_BBRINFO */
+
+struct tcp_bbr_info {
+       /* u64 bw: max-filtered BW (app throughput) estimate in Byte per sec: */
+       __u32   bbr_bw_lo;              /* lower 32 bits of bw */
+       __u32   bbr_bw_hi;              /* upper 32 bits of bw */
+       __u32   bbr_min_rtt;            /* min-filtered RTT in uSec */
+       __u32   bbr_pacing_gain;        /* pacing gain shifted left 8 bits */
+       __u32   bbr_cwnd_gain;          /* cwnd gain shifted left 8 bits */
+};
+
 union tcp_cc_info {
        struct tcpvegas_info    vegas;
        struct tcp_dctcp_info   dctcp;
+       struct tcp_bbr_info     bbr;
 };
 #endif /* _UAPI_INET_DIAG_H_ */