diff options
author | Joe Perches <joe@perches.com> | 2008-03-23 22:05:44 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-23 22:05:44 -0700 |
commit | cc32e05416b4023a5466a2f66e3c02236a771c5b (patch) | |
tree | 8120aa4075ecde38ae9ce487c597aeab1f1e9d70 /include/linux/igmp.h | |
parent | 414f69d8a6ff0b30e7ea5ce10534b19f851e172e (diff) | |
download | kernel_samsung_espresso10-cc32e05416b4023a5466a2f66e3c02236a771c5b.zip kernel_samsung_espresso10-cc32e05416b4023a5466a2f66e3c02236a771c5b.tar.gz kernel_samsung_espresso10-cc32e05416b4023a5466a2f66e3c02236a771c5b.tar.bz2 |
[NET]: include/linux/igmp.h - remove duplicate include
Removed duplicate #include <linux/skbuff.h>
Combined #ifdef __KERNEL__ blocks
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/igmp.h')
-rw-r--r-- | 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 <linux/skbuff.h> - -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 <linux/timer.h> #include <linux/in.h> +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; |