diff options
Diffstat (limited to 'include/linux/in.h')
-rw-r--r-- | include/linux/in.h | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/include/linux/in.h b/include/linux/in.h index cf196da04ec9..b615649db129 100644 --- a/include/linux/in.h +++ b/include/linux/in.h | |||
@@ -118,14 +118,12 @@ struct in_addr { | |||
118 | 118 | ||
119 | /* Request struct for multicast socket ops */ | 119 | /* Request struct for multicast socket ops */ |
120 | 120 | ||
121 | struct ip_mreq | 121 | struct ip_mreq { |
122 | { | ||
123 | struct in_addr imr_multiaddr; /* IP multicast address of group */ | 122 | struct in_addr imr_multiaddr; /* IP multicast address of group */ |
124 | struct in_addr imr_interface; /* local IP address of interface */ | 123 | struct in_addr imr_interface; /* local IP address of interface */ |
125 | }; | 124 | }; |
126 | 125 | ||
127 | struct ip_mreqn | 126 | struct ip_mreqn { |
128 | { | ||
129 | struct in_addr imr_multiaddr; /* IP multicast address of group */ | 127 | struct in_addr imr_multiaddr; /* IP multicast address of group */ |
130 | struct in_addr imr_address; /* local IP address of interface */ | 128 | struct in_addr imr_address; /* local IP address of interface */ |
131 | int imr_ifindex; /* Interface index */ | 129 | int imr_ifindex; /* Interface index */ |
@@ -149,21 +147,18 @@ struct ip_msfilter { | |||
149 | (sizeof(struct ip_msfilter) - sizeof(__u32) \ | 147 | (sizeof(struct ip_msfilter) - sizeof(__u32) \ |
150 | + (numsrc) * sizeof(__u32)) | 148 | + (numsrc) * sizeof(__u32)) |
151 | 149 | ||
152 | struct group_req | 150 | struct group_req { |
153 | { | ||
154 | __u32 gr_interface; /* interface index */ | 151 | __u32 gr_interface; /* interface index */ |
155 | struct __kernel_sockaddr_storage gr_group; /* group address */ | 152 | struct __kernel_sockaddr_storage gr_group; /* group address */ |
156 | }; | 153 | }; |
157 | 154 | ||
158 | struct group_source_req | 155 | struct group_source_req { |
159 | { | ||
160 | __u32 gsr_interface; /* interface index */ | 156 | __u32 gsr_interface; /* interface index */ |
161 | struct __kernel_sockaddr_storage gsr_group; /* group address */ | 157 | struct __kernel_sockaddr_storage gsr_group; /* group address */ |
162 | struct __kernel_sockaddr_storage gsr_source; /* source address */ | 158 | struct __kernel_sockaddr_storage gsr_source; /* source address */ |
163 | }; | 159 | }; |
164 | 160 | ||
165 | struct group_filter | 161 | struct group_filter { |
166 | { | ||
167 | __u32 gf_interface; /* interface index */ | 162 | __u32 gf_interface; /* interface index */ |
168 | struct __kernel_sockaddr_storage gf_group; /* multicast address */ | 163 | struct __kernel_sockaddr_storage gf_group; /* multicast address */ |
169 | __u32 gf_fmode; /* filter mode */ | 164 | __u32 gf_fmode; /* filter mode */ |
@@ -175,8 +170,7 @@ struct group_filter | |||
175 | (sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) \ | 170 | (sizeof(struct group_filter) - sizeof(struct __kernel_sockaddr_storage) \ |
176 | + (numsrc) * sizeof(struct __kernel_sockaddr_storage)) | 171 | + (numsrc) * sizeof(struct __kernel_sockaddr_storage)) |
177 | 172 | ||
178 | struct in_pktinfo | 173 | struct in_pktinfo { |
179 | { | ||
180 | int ipi_ifindex; | 174 | int ipi_ifindex; |
181 | struct in_addr ipi_spec_dst; | 175 | struct in_addr ipi_spec_dst; |
182 | struct in_addr ipi_addr; | 176 | struct in_addr ipi_addr; |