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: Tue, 5 Nov 2013 12:02:11 +0100 From: Jiri Pirko <jiri@...nulli.us> To: netdev@...r.kernel.org Cc: davem@...emloft.net, pablo@...filter.org, netfilter-devel@...r.kernel.org, yoshfuji@...ux-ipv6.org, kadlec@...ckhole.kfki.hu, kaber@...sh.net, mleitner@...hat.com, kuznet@....inr.ac.ru, jmorris@...ei.org, wensong@...ux-vs.org, horms@...ge.net.au, ja@....bg, edumazet@...gle.com, pshelar@...ira.com, jasowang@...hat.com, alexander.h.duyck@...el.com, coreteam@...filter.org, fw@...len.de Subject: [patch net-next 1/3] move skb_nfct_reasm into skbuff.h Signed-off-by: Jiri Pirko <jiri@...nulli.us> --- include/linux/skbuff.h | 11 +++++++++++ include/net/ip_vs.h | 8 -------- net/netfilter/ipvs/ip_vs_core.c | 1 + 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 2e153b6..ececdad 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2606,6 +2606,17 @@ static inline void nf_conntrack_put_reasm(struct sk_buff *skb) kfree_skb(skb); } #endif +#ifdef NET_SKBUFF_NF_DEFRAG_NEEDED +static inline struct sk_buff *skb_nfct_reasm(const struct sk_buff *skb) +{ + return skb->nfct_reasm; +} +#else +static inline struct sk_buff *skb_nfct_reasm(const struct sk_buff *skb) +{ + return NULL; +} +#endif #ifdef CONFIG_BRIDGE_NETFILTER static inline void nf_bridge_put(struct nf_bridge_info *nf_bridge) { diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index cd7275f..6dff2b6 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -119,10 +119,6 @@ struct ip_vs_iphdr { /* Dependency to module: nf_defrag_ipv6 */ #if defined(CONFIG_NF_DEFRAG_IPV6) || defined(CONFIG_NF_DEFRAG_IPV6_MODULE) -static inline struct sk_buff *skb_nfct_reasm(const struct sk_buff *skb) -{ - return skb->nfct_reasm; -} static inline void *frag_safe_skb_hp(const struct sk_buff *skb, int offset, int len, void *buffer, const struct ip_vs_iphdr *ipvsh) @@ -134,10 +130,6 @@ static inline void *frag_safe_skb_hp(const struct sk_buff *skb, int offset, return skb_header_pointer(skb, offset, len, buffer); } #else -static inline struct sk_buff *skb_nfct_reasm(const struct sk_buff *skb) -{ - return NULL; -} static inline void *frag_safe_skb_hp(const struct sk_buff *skb, int offset, int len, void *buffer, const struct ip_vs_iphdr *ipvsh) diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c index 34fda62..085c242 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c @@ -43,6 +43,7 @@ #include <net/ip6_checksum.h> #include <net/netns/generic.h> /* net_generic() */ +#include <linux/skbuff.h> #include <linux/netfilter.h> #include <linux/netfilter_ipv4.h> -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists