lkml.org 
[lkml]   [2007]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patches in this message
    /
    From
    Date
    Subject[PATCH 003 of 3] knfsd: Remove CONFIG_IPV6 ifdefs from sunrpc server code.

    They don't really save that much, and aren't worth the hassle.

    Signed-off-by: Neil Brown <neilb@suse.de>

    ### Diffstat output
    ./include/linux/sunrpc/svc.h | 2 --
    ./net/sunrpc/svcsock.c | 13 +++----------
    2 files changed, 3 insertions(+), 12 deletions(-)

    diff .prev/include/linux/sunrpc/svc.h ./include/linux/sunrpc/svc.h
    --- .prev/include/linux/sunrpc/svc.h 2007-03-02 14:20:13.000000000 +1100
    +++ ./include/linux/sunrpc/svc.h 2007-03-02 15:14:11.000000000 +1100
    @@ -194,9 +194,7 @@ static inline void svc_putu32(struct kve

    union svc_addr_u {
    struct in_addr addr;
    -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
    struct in6_addr addr6;
    -#endif
    };

    /*
    diff .prev/net/sunrpc/svcsock.c ./net/sunrpc/svcsock.c
    --- .prev/net/sunrpc/svcsock.c 2007-03-02 15:12:52.000000000 +1100
    +++ ./net/sunrpc/svcsock.c 2007-03-02 15:14:11.000000000 +1100
    @@ -131,13 +131,13 @@ static char *__svc_print_addr(struct soc
    NIPQUAD(((struct sockaddr_in *) addr)->sin_addr),
    htons(((struct sockaddr_in *) addr)->sin_port));
    break;
    -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
    +
    case AF_INET6:
    snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x, port=%u",
    NIP6(((struct sockaddr_in6 *) addr)->sin6_addr),
    htons(((struct sockaddr_in6 *) addr)->sin6_port));
    break;
    -#endif
    +
    default:
    snprintf(buf, len, "unknown address type: %d", addr->sa_family);
    break;
    @@ -449,9 +449,7 @@ svc_wake_up(struct svc_serv *serv)

    union svc_pktinfo_u {
    struct in_pktinfo pkti;
    -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
    struct in6_pktinfo pkti6;
    -#endif
    };

    static void svc_set_cmsg_data(struct svc_rqst *rqstp, struct cmsghdr *cmh)
    @@ -467,7 +465,7 @@ static void svc_set_cmsg_data(struct svc
    cmh->cmsg_len = CMSG_LEN(sizeof(*pki));
    }
    break;
    -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
    +
    case AF_INET6: {
    struct in6_pktinfo *pki = CMSG_DATA(cmh);

    @@ -479,7 +477,6 @@ static void svc_set_cmsg_data(struct svc
    cmh->cmsg_len = CMSG_LEN(sizeof(*pki));
    }
    break;
    -#endif
    }
    return;
    }
    @@ -730,13 +727,11 @@ static inline void svc_udp_get_dest_addr
    rqstp->rq_daddr.addr.s_addr = pki->ipi_spec_dst.s_addr;
    break;
    }
    -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
    case AF_INET6: {
    struct in6_pktinfo *pki = CMSG_DATA(cmh);
    ipv6_addr_copy(&rqstp->rq_daddr.addr6, &pki->ipi6_addr);
    break;
    }
    -#endif
    }
    }

    @@ -976,11 +971,9 @@ static inline int svc_port_is_privileged
    case AF_INET:
    return ntohs(((struct sockaddr_in *)sin)->sin_port)
    < PROT_SOCK;
    -#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
    case AF_INET6:
    return ntohs(((struct sockaddr_in6 *)sin)->sin6_port)
    < PROT_SOCK;
    -#endif
    default:
    return 0;
    }
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-03-02 05:35    [W:0.022 / U:0.612 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site