History

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

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. ====================

David S. Miller committed 11 years ago

Commit 73e84312 parents e278371 1add15630 files · +1308 −364Browse files

Showing the changes to include/uapi/linux (2 of 30 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/inet_diag.h +4 −0
  2. include/uapi/linux/tcp.h +3 −0
include/uapi/linux/inet_diag.h+4−0
@@ -143,4 +143,8 @@ struct tcp_dctcp_info { · 142 unmodified lines
143 __u32 dctcp_ab_tot;143 __u32 dctcp_ab_tot;
144};144};
145 145
146union tcp_cc_info {
147 struct tcpvegas_info vegas;
148 struct tcp_dctcp_info dctcp;
149};
146#endif /* _UAPI_INET_DIAG_H_ */150#endif /* _UAPI_INET_DIAG_H_ */
include/uapi/linux/tcp.h+3−0
@@ -112,6 +112,7 @@ enum { · 111 unmodified lines
112#define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */112#define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */
113#define TCP_TIMESTAMP 24113#define TCP_TIMESTAMP 24
114#define TCP_NOTSENT_LOWAT 25 /* limit number of unsent bytes in write queue */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
116struct tcp_repair_opt {117struct tcp_repair_opt {
117 __u32 opt_code;118 __u32 opt_code;
@@ -189,6 +190,8 @@ struct tcp_info { · 71 unmodified lines
189 190
190 __u64 tcpi_pacing_rate;191 __u64 tcpi_pacing_rate;
191 __u64 tcpi_max_pacing_rate;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/* for TCP_MD5SIG socket option */197/* for TCP_MD5SIG socket option */