netfilter: nf_reject_ipv4: remove unneeded exports
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 netfilter: nf_reject_ipv4: remove unneeded exports
These functions have no external callers and can be static.
Signed-off-by Florian Westphal <[email protected]>
--- include/net/netfilter/ipv4/nf_reject.h | 8 ------ include/net/netfilter/ipv6/nf_reject.h | 10 ------- net/ipv4/netfilter/nf_reject_ipv4.c | 27 ++++++++++++------- net/ipv6/netfilter/nf_reject_ipv6.c | 37 +++++++++++++++++--------- 4 files changed, 42 insertions(+), 40 deletions(-)
include/net/netfilter/ipv4/nf_reject.h +0 -8
@@ -10,14 +10,6 @@void nf_send_unreach (struct sk_buff *skb_in,int code,int hook);void nf_send_reset (struct net *net,struct sock *,struct sk_buff *oldskb,int hook); -const struct tcphdr *nf_reject_ip_tcphdr_get (struct sk_buff *oldskb, -struct tcphdr *_oth,int hook); -struct iphdr *nf_reject_iphdr_put (struct sk_buff *nskb, -const struct sk_buff *oldskb, -__u8 protocol,int ttl); -void nf_reject_ip_tcphdr_put (struct sk_buff *nskb,const struct sk_buff *oldskb, -const struct tcphdr *oth); - struct sk_buff *nf_reject_skb_v4_unreach(struct net *net, struct sk_buff *oldskb, const struct net_device *dev,
include/net/netfilter/ipv6/nf_reject.h +0 -10
@@ -9,16 +9,6 @@ void nf_send_unreach6(struct net *net, struct sk_buff *skb_in, unsigned char cod unsigned int hooknum);void nf_send_reset6 (struct net *net,struct sock *sk,struct sk_buff *oldskb,int hook); -const struct tcphdr *nf_reject_ip6_tcphdr_get (struct sk_buff *oldskb, -struct tcphdr *otcph, -unsigned int *otcplen,int hook); -struct ipv6hdr *nf_reject_ip6hdr_put (struct sk_buff *nskb, -const struct sk_buff *oldskb, -__u8 protocol,int hoplimit); -void nf_reject_ip6_tcphdr_put (struct sk_buff *nskb, -const struct sk_buff *oldskb, -const struct tcphdr *oth,unsigned int otcplen); - struct sk_buff *nf_reject_skb_v6_tcp_reset(struct net *net, struct sk_buff *oldskb, const struct net_device *dev,
net/ipv4/netfilter/nf_reject_ipv4.c +17 -10
@@ -12,6 +12,15 @@#include <linux/netfilter_ipv4.h> #include <linux/netfilter_bridge.h> +static struct iphdr *nf_reject_iphdr_put (struct sk_buff *nskb, +const struct sk_buff *oldskb, +__u8 protocol,int ttl); +static void nf_reject_ip_tcphdr_put (struct sk_buff *nskb,const struct sk_buff *oldskb, +const struct tcphdr *oth); +static const struct tcphdr * +nf_reject_ip_tcphdr_get (struct sk_buff *oldskb, +struct tcphdr *_oth,int hook); +static int nf_reject_iphdr_validate (struct sk_buff *skb) {struct iphdr *iph;
@@ -136,8 +145,9 @@ struct sk_buff *nf_reject_skb_v4_unreach(struct net *net, }EXPORT_SYMBOL_GPL (nf_reject_skb_v4_unreach); -const struct tcphdr *nf_reject_ip_tcphdr_get (struct sk_buff *oldskb, -struct tcphdr *_oth,int hook) +static const struct tcphdr * +nf_reject_ip_tcphdr_get (struct sk_buff *oldskb, +struct tcphdr *_oth,int hook) {const struct tcphdr *oth;
@@ -163,11 +173,10 @@ const struct tcphdr *nf_reject_ip_tcphdr_get(struct sk_buff *oldskb,return oth; } -EXPORT_SYMBOL_GPL (nf_reject_ip_tcphdr_get); -struct iphdr *nf_reject_iphdr_put (struct sk_buff *nskb, -const struct sk_buff *oldskb, -__u8 protocol,int ttl) +static struct iphdr *nf_reject_iphdr_put (struct sk_buff *nskb, +const struct sk_buff *oldskb, +__u8 protocol,int ttl) {struct iphdr *niph, *oiph =ip_hdr (oldskb);
@@ -188,10 +197,9 @@ struct iphdr *nf_reject_iphdr_put(struct sk_buff *nskb,return niph; } -EXPORT_SYMBOL_GPL (nf_reject_iphdr_put); -void nf_reject_ip_tcphdr_put (struct sk_buff *nskb,const struct sk_buff *oldskb, -const struct tcphdr *oth) +static void nf_reject_ip_tcphdr_put (struct sk_buff *nskb,const struct sk_buff *oldskb, +const struct tcphdr *oth) {struct iphdr *niph =ip_hdr (nskb);struct tcphdr *tcph;
@@ -218,7 +226,6 @@ void nf_reject_ip_tcphdr_put(struct sk_buff *nskb, const struct sk_buff *oldskb, nskb->csum_start = (unsigned char *)tcph - nskb->head; nskb->csum_offset = offsetof(struct tcphdr , check); } -EXPORT_SYMBOL_GPL (nf_reject_ip_tcphdr_put);static int nf_reject_fill_skb_dst (struct sk_buff *skb_in) {
net/ipv6/netfilter/nf_reject_ipv6.c +25 -12
@@ -12,6 +12,19 @@#include <linux/netfilter_ipv6.h> #include <linux/netfilter_bridge.h> +static struct ipv6hdr * +nf_reject_ip6hdr_put (struct sk_buff *nskb, +const struct sk_buff *oldskb, +__u8 protocol,int hoplimit); +static void +nf_reject_ip6_tcphdr_put (struct sk_buff *nskb, +const struct sk_buff *oldskb, +const struct tcphdr *oth,unsigned int otcplen); +static const struct tcphdr * +nf_reject_ip6_tcphdr_get (struct sk_buff *oldskb, +struct tcphdr *otcph, +unsigned int *otcplen,int hook); +static bool nf_reject_v6_csum_ok (struct sk_buff *skb,int hook) {const struct ipv6hdr *ip6h =ipv6_hdr (skb);
@@ -146,9 +159,10 @@ struct sk_buff *nf_reject_skb_v6_unreach(struct net *net, }EXPORT_SYMBOL_GPL (nf_reject_skb_v6_unreach); -const struct tcphdr *nf_reject_ip6_tcphdr_get (struct sk_buff *oldskb, -struct tcphdr *otcph, -unsigned int *otcplen,int hook) +static const struct tcphdr * +nf_reject_ip6_tcphdr_get (struct sk_buff *oldskb, +struct tcphdr *otcph, +unsigned int *otcplen,int hook) {const struct ipv6hdr *oip6h =ipv6_hdr (oldskb);u8 proto;
@@ -192,11 +206,11 @@ const struct tcphdr *nf_reject_ip6_tcphdr_get(struct sk_buff *oldskb,return otcph; } -EXPORT_SYMBOL_GPL (nf_reject_ip6_tcphdr_get); -struct ipv6hdr *nf_reject_ip6hdr_put (struct sk_buff *nskb, -const struct sk_buff *oldskb, -__u8 protocol,int hoplimit) +static struct ipv6hdr * +nf_reject_ip6hdr_put (struct sk_buff *nskb, +const struct sk_buff *oldskb, +__u8 protocol,int hoplimit) {struct ipv6hdr *ip6h;const struct ipv6hdr *oip6h =ipv6_hdr (oldskb);
@@ -216,11 +230,11 @@ struct ipv6hdr *nf_reject_ip6hdr_put(struct sk_buff *nskb,return ip6h; } -EXPORT_SYMBOL_GPL (nf_reject_ip6hdr_put); -void nf_reject_ip6_tcphdr_put (struct sk_buff *nskb, -const struct sk_buff *oldskb, -const struct tcphdr *oth,unsigned int otcplen) +static void +nf_reject_ip6_tcphdr_put (struct sk_buff *nskb, +const struct sk_buff *oldskb, +const struct tcphdr *oth,unsigned int otcplen) {struct tcphdr *tcph;
@@ -248,7 +262,6 @@ void nf_reject_ip6_tcphdr_put(struct sk_buff *nskb,csum_partial (tcph, sizeof(struct tcphdr), 0)); } -EXPORT_SYMBOL_GPL (nf_reject_ip6_tcphdr_put);static int nf_reject6_fill_skb_dst (struct sk_buff *skb_in) {
Signature · 1 line
2.49.1