Johan Hedberg says: ==================== pull request: bluetooth-next 2015-05-04 Here's the first bluetooth-next pull request for 4.2: - Various fixes for at86rf230 driver - ieee802154: trace events support for rdev->ops - HCI UART driver refactoring - New Realtek IDs added to btusb driver - Off-by-one fix for rtl8723b in btusb driver - Refactoring of btbcm driver for both UART & USB use Please let me know if there are any issues pulling. Thanks. ====================
Showing the changes to include/uapi/linux (2 of 30 files). Show all
Unified · Split
| @@ -143,4 +143,8 @@ struct tcp_dctcp_info { · 142 unmodified lines | ||
| 143 | 143 | __u32 dctcp_ab_tot; |
| 144 | 144 | }; |
| 145 | 145 | |
| 146 | +union tcp_cc_info { | |
| 147 | + struct tcpvegas_info vegas; | |
| 148 | + struct tcp_dctcp_info dctcp; | |
| 149 | +}; | |
| 146 | 150 | #endif /* _UAPI_INET_DIAG_H_ */ |
| @@ -112,6 +112,7 @@ enum { · 111 unmodified lines | ||
| 112 | 112 | #define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */ |
| 113 | 113 | #define TCP_TIMESTAMP 24 |
| 114 | 114 | #define TCP_NOTSENT_LOWAT 25 /* limit number of unsent bytes in write queue */ |
| 115 | +#define TCP_CC_INFO 26 /* Get Congestion Control (optional) info */ | |
| 115 | 116 | |
| 116 | 117 | struct tcp_repair_opt { |
| 117 | 118 | __u32 opt_code; |
| @@ -189,6 +190,8 @@ struct tcp_info { · 71 unmodified lines | ||
| 189 | 190 | |
| 190 | 191 | __u64 tcpi_pacing_rate; |
| 191 | 192 | __u64 tcpi_max_pacing_rate; |
| 193 | + __u64 tcpi_bytes_acked; /* RFC4898 tcpEStatsAppHCThruOctetsAcked */ | |
| 194 | + __u64 tcpi_bytes_received; /* RFC4898 tcpEStatsAppHCThruOctetsReceived */ | |
| 192 | 195 | }; |
| 193 | 196 | |
| 194 | 197 | /* for TCP_MD5SIG socket option */ |