lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 24 Mar 2008 10:46:34 -0700 From: Joe Perches <joe@...ches.com> To: David Miller <davem@...emloft.net> Cc: yoshfuji@...ux-ipv6.org, netdev@...r.kernel.org, linux-kernel@...r.kernel.org Subject: [PATCH 1/2] include/linux/icmpv6.h - Remove duplicate include, combine #ifdef __KERNEL__ sections On Sun, 2008-03-23 at 22:18 -0700, David Miller wrote: > Does not apply to net-2.6.26, dropped. Signed-off-by: Joe Perches <joe@...ches.com> --- include/linux/icmpv6.h | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h index 0306744..c1a30c7 100644 --- a/include/linux/icmpv6.h +++ b/include/linux/icmpv6.h @@ -75,15 +75,6 @@ struct icmp6hdr { #define icmp6_router_pref icmp6_dataun.u_nd_ra.router_pref }; -#ifdef __KERNEL__ -#include <linux/skbuff.h> - -static inline struct icmp6hdr *icmp6_hdr(const struct sk_buff *skb) -{ - return (struct icmp6hdr *)skb_transport_header(skb); -} -#endif - #define ICMPV6_ROUTER_PREF_LOW 0x3 #define ICMPV6_ROUTER_PREF_MEDIUM 0x0 #define ICMPV6_ROUTER_PREF_HIGH 0x1 @@ -170,6 +161,10 @@ struct icmp6_filter { #include <linux/netdevice.h> #include <linux/skbuff.h> +static inline struct icmp6hdr *icmp6_hdr(const struct sk_buff *skb) +{ + return (struct icmp6hdr *)skb_transport_header(skb); +} extern void icmpv6_send(struct sk_buff *skb, int type, int code, -- 1.5.4.rc2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists