Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[mv-sheeva.git] / net / ipv4 / ip_sockglue.c

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index e982b5c1ee17c6788b3a11767336ef59ebb2983a..a72f43ce33bee17aa39b4208b6f378ef30e031e5 100644 (file)
--- 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,
 {
        struct ip_ra_chain *ra, *new_ra, **rap;
 
-       if (sk->sk_type != SOCK_RAW || inet_sk(sk)->num == IPPROTO_RAW)
+       if (sk->sk_type != SOCK_RAW || inet_sk(sk)->inet_num == IPPROTO_RAW)
                return -EINVAL;
 
        new_ra = on ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL;
@@ -492,7 +492,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                        if (sk->sk_family == PF_INET ||
                            (!((1 << sk->sk_state) &
                               (TCPF_LISTEN | TCPF_CLOSE)) &&
-                            inet->daddr != LOOPBACK4_IPV6)) {
+                            inet->inet_daddr != LOOPBACK4_IPV6)) {
 #endif
                                if (inet->opt)
                                        icsk->icsk_ext_hdr_len -= inet->opt->optlen;
@@ -575,7 +575,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                inet->hdrincl = val ? 1 : 0;
                break;
        case IP_MTU_DISCOVER:
-               if (val < 0 || val > 3)
+               if (val < IP_PMTUDISC_DONT || val > IP_PMTUDISC_PROBE)
                        goto e_inval;
                inet->pmtudisc = val;
                break;
@@ -1180,8 +1180,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
                if (inet->cmsg_flags & IP_CMSG_PKTINFO) {
                        struct in_pktinfo info;
 
-                       info.ipi_addr.s_addr = inet->rcv_saddr;
-                       info.ipi_spec_dst.s_addr = inet->rcv_saddr;
+                       info.ipi_addr.s_addr = inet->inet_rcv_saddr;
+                       info.ipi_spec_dst.s_addr = inet->inet_rcv_saddr;
                        info.ipi_ifindex = inet->mc_index;
                        put_cmsg(&msg, SOL_IP, IP_PKTINFO, sizeof(info), &info);
                }