diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-04 15:36:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-04 15:36:07 -0400 |
| commit | 73e84313ee4178cac628009103a901af9dfe8920 (patch) | |
| tree | 6328e1f97e4757dcf59d99e97eb2b70b352e62da /include/uapi/linux/inet_diag.h | |
| parent | e2783717a71e9babfdd7c36c7e35b790d2c01022 (diff) | |
| parent | 1add15646672ff4e7fe59bec2afcb5a0c80c5e49 (diff) | |
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.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/inet_diag.h')
| -rw-r--r-- | include/uapi/linux/inet_diag.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/linux/inet_diag.h b/include/uapi/linux/inet_diag.h index d65c0a09efd3..c7093c75bdd6 100644 --- a/include/uapi/linux/inet_diag.h +++ b/include/uapi/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 /* _UAPI_INET_DIAG_H_ */ |