diff options
Diffstat (limited to 'include/linux/in.h')
-rw-r--r-- | include/linux/in.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/include/linux/in.h b/include/linux/in.h index cf196da04ec9..583c76f9c30f 100644 --- a/include/linux/in.h +++ b/include/linux/in.h | |||
@@ -84,6 +84,8 @@ struct in_addr { | |||
84 | #define IP_ORIGDSTADDR 20 | 84 | #define IP_ORIGDSTADDR 20 |
85 | #define IP_RECVORIGDSTADDR IP_ORIGDSTADDR | 85 | #define IP_RECVORIGDSTADDR IP_ORIGDSTADDR |
86 | 86 | ||
87 | #define IP_MINTTL 21 | ||
88 | |||
87 | /* IP_MTU_DISCOVER values */ | 89 | /* IP_MTU_DISCOVER values */ |
88 | #define IP_PMTUDISC_DONT 0 /* Never send DF frames */ | 90 | #define IP_PMTUDISC_DONT 0 /* Never send DF frames */ |
89 | #define IP_PMTUDISC_WANT 1 /* Use per route hints */ | 91 | #define IP_PMTUDISC_WANT 1 /* Use per route hints */ |
@@ -118,14 +120,12 @@ struct in_addr { | |||
118 | 120 | ||
119 | /* Request struct for multicast socket ops */ | 121 | /* Request struct for multicast socket ops */ |
120 | 122 | ||
121 | struct ip_mreq | 123 | struct ip_mreq { |
122 | { | ||
123 | struct in_addr imr_multiaddr; /* IP multicast address of group */ | 124 | struct in_addr imr_multiaddr; /* IP multicast address of group */ |
124 | struct in_addr imr_interface; /* local IP address of interface */ | 125 | struct in_addr imr_interface; /* local IP address of interface */ |
125 | }; | 126 | }; |
126 | 127 | ||
127 | struct ip_mreqn | 128 | struct ip_mreqn { |
128 | { | ||
129 | struct in_addr imr_multiaddr; /* IP multicast address of group */ | 129 | struct in_addr imr_multiaddr; /* IP multicast address of group */ |
130 | struct in_addr imr_address; /* local IP address of interface */ | 130 | struct in_addr imr_address; /* local IP address of interface */ |
131 | int imr_ifindex; /* Interface index */ | 131 | int imr_ifindex; /* Interface index */ |
@@ -149,21 +149,18 @@ struct ip_msfilter { | |||
149 | (sizeof(struct ip_msfilter) - sizeof(__u32) \ | 149 | (sizeof(struct ip_msfilter) - sizeof(__u32) \ |
150 | + (numsrc) * sizeof(__u32)) | 150 | + (numsrc) * sizeof(__u32)) |
151 | 151 | ||
152 | struct group_req | 152 | struct group_req { |
153 | { | ||
154 | __u32 gr_interface; /* interface index */ | 153 | __u32 gr_interface; /* interface index */ |
155 | struct __kernel_sockaddr_storage gr_group; /* group address */ | 154 | struct __kernel_sockaddr_storage gr_group; /* group address */ |
156 | }; | 155 | }; |
157 | 156 | ||
158 | struct group_source_req | 157 | struct group_source_req { |
159 | { | ||
160 | __u32 gsr_interface; /* interface index */ | 158 | __u32 gsr_interface; /* interface index */ |
161 | struct __kernel_sockaddr_storage gsr_group; /* group address */ | 159 | struct __kernel_sockaddr_storage gsr_group; /* group address */ |
162 | struct __kernel_sockaddr_storage gsr_source; /* source address */ | 160 | struct __kernel_sockaddr_storage gsr_source; /* source address */ |
163 | }; | 161 | }; |
164 | 162 | ||
165 | struct group_filter | 163 | struct group_filter { |
166 | { | ||
167 | __u32 gf_interface; /* interface index */ | 164 | __u32 gf_interface; /* interface index */ |
168 | struct __kernel_sockaddr_storage gf_group; /* multicast address */ | 165 | struct __kernel_sockaddr_storage gf_group; /* multicast address */ |
169 | __u32 gf_fmode; /* filter mode */ | 166 | __u32 gf_fmode; /* filter mode */ |
@@ -175,8 +172,7 @@ struct group_filter | |||
175 | (sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) \ | 172 | (sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) \ |
176 | + (numsrc) * sizeof(struct __kernel_sockaddr_storage)) | 173 | + (numsrc) * sizeof(struct __kernel_sockaddr_storage)) |
177 | 174 | ||
178 | struct in_pktinfo | 175 | struct in_pktinfo { |
179 | { | ||
180 | int ipi_ifindex; | 176 | int ipi_ifindex; |
181 | struct in_addr ipi_spec_dst; | 177 | struct in_addr ipi_spec_dst; |
182 | struct in_addr ipi_addr; | 178 | struct in_addr ipi_addr; |