diff options
Diffstat (limited to 'net/ipv4/ip_sockglue.c')
-rw-r--r-- | net/ipv4/ip_sockglue.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c index 0c0b6e363a20..c602d985fe14 100644 --- a/net/ipv4/ip_sockglue.c +++ b/net/ipv4/ip_sockglue.c | |||
@@ -245,7 +245,7 @@ int ip_ra_control(struct sock *sk, unsigned char on, | |||
245 | { | 245 | { |
246 | struct ip_ra_chain *ra, *new_ra, **rap; | 246 | struct ip_ra_chain *ra, *new_ra, **rap; |
247 | 247 | ||
248 | if (sk->sk_type != SOCK_RAW || inet_sk(sk)->num == IPPROTO_RAW) | 248 | if (sk->sk_type != SOCK_RAW || inet_sk(sk)->inet_num == IPPROTO_RAW) |
249 | return -EINVAL; | 249 | return -EINVAL; |
250 | 250 | ||
251 | new_ra = on ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL; | 251 | new_ra = on ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL; |
@@ -492,7 +492,7 @@ static int do_ip_setsockopt(struct sock *sk, int level, | |||
492 | if (sk->sk_family == PF_INET || | 492 | if (sk->sk_family == PF_INET || |
493 | (!((1 << sk->sk_state) & | 493 | (!((1 << sk->sk_state) & |
494 | (TCPF_LISTEN | TCPF_CLOSE)) && | 494 | (TCPF_LISTEN | TCPF_CLOSE)) && |
495 | inet->daddr != LOOPBACK4_IPV6)) { | 495 | inet->inet_daddr != LOOPBACK4_IPV6)) { |
496 | #endif | 496 | #endif |
497 | if (inet->opt) | 497 | if (inet->opt) |
498 | icsk->icsk_ext_hdr_len -= inet->opt->optlen; | 498 | icsk->icsk_ext_hdr_len -= inet->opt->optlen; |
@@ -1181,8 +1181,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname, | |||
1181 | if (inet->cmsg_flags & IP_CMSG_PKTINFO) { | 1181 | if (inet->cmsg_flags & IP_CMSG_PKTINFO) { |
1182 | struct in_pktinfo info; | 1182 | struct in_pktinfo info; |
1183 | 1183 | ||
1184 | info.ipi_addr.s_addr = inet->rcv_saddr; | 1184 | info.ipi_addr.s_addr = inet->inet_rcv_saddr; |
1185 | info.ipi_spec_dst.s_addr = inet->rcv_saddr; | 1185 | info.ipi_spec_dst.s_addr = inet->inet_rcv_saddr; |
1186 | info.ipi_ifindex = inet->mc_index; | 1186 | info.ipi_ifindex = inet->mc_index; |
1187 | put_cmsg(&msg, SOL_IP, IP_PKTINFO, sizeof(info), &info); | 1187 | put_cmsg(&msg, SOL_IP, IP_PKTINFO, sizeof(info), &info); |
1188 | } | 1188 | } |