update headers to 4.1-rc1 net-next

diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index 7438dad7b7fe7337e7355ceedffbdcce04ce9c91..0fb76bb95eb971c339577d136ce226210c1b19b9 100644 (file)
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -143,4 +143,8 @@ struct tcp_dctcp_info {
        __u32   dctcp_ab_tot;
 };
 
+union tcp_cc_info {
+       struct tcpvegas_info    vegas;
+       struct tcp_dctcp_info   dctcp;
+};
 #endif /* _INET_DIAG_H_ */

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index bf08e76bf50525912360edbfe09b1e220f683e94..5674737f988bc270f005fced11beaa499d0b41d5 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -35,6 +35,7 @@ bits 9,10,11: redirect counter -  redirect TTL. Loop avoidance
  *
  * */
 
+/* backwards compat for userspace only */
 #define TC_MUNGED          _TC_MAKEMASK1(0)
 #define SET_TC_MUNGED(v)   ( TC_MUNGED | (v & ~TC_MUNGED))
 #define CLR_TC_MUNGED(v)   ( v & ~TC_MUNGED)

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index f96e0158405cfa16f5957f943cf52882d7f661e4..1e002563be7267fec1afca1d311d27fc62c8f5a9 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -112,6 +112,7 @@ enum {
 #define TCP_FASTOPEN           23      /* Enable FastOpen on listeners */
 #define TCP_TIMESTAMP          24
 #define TCP_NOTSENT_LOWAT      25      /* limit number of unsent bytes in write queue */
+#define TCP_CC_INFO            26      /* Get Congestion Control (optional) info */
 
 struct tcp_repair_opt {
        __u32   opt_code;
@@ -189,6 +190,8 @@ struct tcp_info {
 
        __u64   tcpi_pacing_rate;
        __u64   tcpi_max_pacing_rate;
+       __u64   tcpi_bytes_acked; /* RFC4898 tcpEStatsAppHCThruOctetsAcked */
+       __u64   tcpi_bytes_received; /* RFC4898 tcpEStatsAppHCThruOctetsReceived */
 };
 
 /* for TCP_MD5SIG socket option */