[PATCH] include/linux/igmp.h - remove duplicate include - Kernel

This is a discussion on [PATCH] include/linux/igmp.h - remove duplicate include - Kernel ; Removed duplicate #include Combined #ifdef __KERNEL__ blocks Signed-off-by: Joe Perches include/linux/igmp.h | 38 +++++++++++++++++--------------------- 1 files changed, 17 insertions(+), 21 deletions(-) diff --git a/include/linux/igmp.h b/include/linux/igmp.h index f510e7e..f5a1a0d 100644 --- a/include/linux/igmp.h +++ b/include/linux/igmp.h @@ -80,27 +80,6 @@ struct igmpv3_query { __be32 ...

+ Reply to Thread
Results 1 to 2 of 2

Thread: [PATCH] include/linux/igmp.h - remove duplicate include

  1. [PATCH] include/linux/igmp.h - remove duplicate include

    Removed duplicate #include
    Combined #ifdef __KERNEL__ blocks

    Signed-off-by: Joe Perches

    include/linux/igmp.h | 38 +++++++++++++++++---------------------
    1 files changed, 17 insertions(+), 21 deletions(-)

    diff --git a/include/linux/igmp.h b/include/linux/igmp.h
    index f510e7e..f5a1a0d 100644
    --- a/include/linux/igmp.h
    +++ b/include/linux/igmp.h
    @@ -80,27 +80,6 @@ struct igmpv3_query {
    __be32 srcs[0];
    };

    -#ifdef __KERNEL__
    -#include
    -
    -static inline struct igmphdr *igmp_hdr(const struct sk_buff *skb)
    -{
    - return (struct igmphdr *)skb_transport_header(skb);
    -}
    -
    -static inline struct igmpv3_report *
    - igmpv3_report_hdr(const struct sk_buff *skb)
    -{
    - return (struct igmpv3_report *)skb_transport_header(skb);
    -}
    -
    -static inline struct igmpv3_query *
    - igmpv3_query_hdr(const struct sk_buff *skb)
    -{
    - return (struct igmpv3_query *)skb_transport_header(skb);
    -}
    -#endif
    -
    #define IGMP_HOST_MEMBERSHIP_QUERY 0x11 /* From RFC1112 */
    #define IGMP_HOST_MEMBERSHIP_REPORT 0x12 /* Ditto */
    #define IGMP_DVMRP 0x13 /* DVMRP routing */
    @@ -151,6 +130,23 @@ static inline struct igmpv3_query *
    #include
    #include

    +static inline struct igmphdr *igmp_hdr(const struct sk_buff *skb)
    +{
    + return (struct igmphdr *)skb_transport_header(skb);
    +}
    +
    +static inline struct igmpv3_report *
    + igmpv3_report_hdr(const struct sk_buff *skb)
    +{
    + return (struct igmpv3_report *)skb_transport_header(skb);
    +}
    +
    +static inline struct igmpv3_query *
    + igmpv3_query_hdr(const struct sk_buff *skb)
    +{
    + return (struct igmpv3_query *)skb_transport_header(skb);
    +}
    +
    extern int sysctl_igmp_max_memberships;
    extern int sysctl_igmp_max_msf;



    --
    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/

  2. Re: [PATCH] include/linux/igmp.h - remove duplicate include

    From: Joe Perches
    Date: Sun, 09 Mar 2008 16:55:40 -0700

    > Removed duplicate #include
    > Combined #ifdef __KERNEL__ blocks
    >
    > Signed-off-by: Joe Perches


    Applied.
    --
    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/

+ Reply to Thread