Samsung updates for v4.2 - add failure(exception) handling : of_iomap(), of_find_device_by_node() and kstrdup() - add common poweroff to use PS_HOLD based for all of exynos SoCs - add exnos_get/set_boot_addr() helper - constify platform_device_id and irq_domain_ops - get current parent clock for power domain on/off - use core_initcall to register power domain driver - make exynos_core_restart() less verbose - add support coupled CPUidle for exynos3250 - fix exynos_boot_secondary() return value on timeout - fix clk_enable() in s3c24xx adc - fix missing of_node_put() for power domains * tag 'samsung-mach-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (301 commits) ARM: EXYNOS: register power domain driver from core_initcall ARM: EXYNOS: use PS_HOLD based poweroff for all supported SoCs ARM: SAMSUNG: Constify platform_device_id ARM: EXYNOS: Constify irq_domain_ops ARM: EXYNOS: add coupled cpuidle support for Exynos3250 ARM: EXYNOS: add exynos_get_boot_addr() helper ARM: EXYNOS: add exynos_set_boot_addr() helper ARM: EXYNOS: make exynos_core_restart() less verbose ARM: EXYNOS: fix exynos_boot_secondary() return value on timeout ARM: EXYNOS: Get current parent clock for power domain on/off ARM: SAMSUNG: fix clk_enable() WARNing in S3C24XX ADC ARM: EXYNOS: Add missing of_node_put() when parsing power domains ARM: EXYNOS: Handle of_find_device_by_node() and kstrdup() failures ARM: EXYNOS: Handle of of_iomap() failure Linux 4.1-rc4 ....
Showing the changes to include/uapi (3 of 336 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_ */ |
| @@ -31,4 +31,14 @@ struct mpls_label { · 30 unmodified lines | ||
| 31 | 31 | #define MPLS_LS_TTL_MASK 0x000000FF |
| 32 | 32 | #define MPLS_LS_TTL_SHIFT 0 |
| 33 | 33 | |
| 34 | +/* Reserved labels */ | |
| 35 | +#define MPLS_LABEL_IPV4NULL 0 /* RFC3032 */ | |
| 36 | +#define MPLS_LABEL_RTALERT 1 /* RFC3032 */ | |
| 37 | +#define MPLS_LABEL_IPV6NULL 2 /* RFC3032 */ | |
| 38 | +#define MPLS_LABEL_IMPLNULL 3 /* RFC3032 */ | |
| 39 | +#define MPLS_LABEL_ENTROPY 7 /* RFC6790 */ | |
| 40 | +#define MPLS_LABEL_GAL 13 /* RFC5586 */ | |
| 41 | +#define MPLS_LABEL_OAMALERT 14 /* RFC3429 */ | |
| 42 | +#define MPLS_LABEL_EXTENSION 15 /* RFC7274 */ | |
| 43 | + | |
| 34 | 44 | #endif /* _UAPI_MPLS_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 */ |