diff options
author | Florian Westphal <fw@strlen.de> | 2014-11-13 04:04:16 -0500 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-11-13 06:14:42 -0500 |
commit | 56768644317c7746cb63f61573fcdc2355885707 (patch) | |
tree | 4017ecc79619024d7af5d7588cb2ce5b0fb8fe83 /net/ipv4 | |
parent | baf4750d92cdfb63d6535f7166c6189d07407b65 (diff) |
netfilter: fix various sparse warnings
net/bridge/br_netfilter.c:870:6: symbol 'br_netfilter_enable' was not declared. Should it be static?
no; add include
net/ipv4/netfilter/nft_reject_ipv4.c:22:6: symbol 'nft_reject_ipv4_eval' was not declared. Should it be static?
yes
net/ipv6/netfilter/nf_reject_ipv6.c:16:6: symbol 'nf_send_reset6' was not declared. Should it be static?
no; add include
net/ipv6/netfilter/nft_reject_ipv6.c:22:6: symbol 'nft_reject_ipv6_eval' was not declared. Should it be static?
yes
net/netfilter/core.c:33:32: symbol 'nf_ipv6_ops' was not declared. Should it be static?
no; add include
net/netfilter/xt_DSCP.c:40:57: cast truncates bits from constant value (ffffff03 becomes 3)
net/netfilter/xt_DSCP.c:57:59: cast truncates bits from constant value (ffffff03 becomes 3)
add __force, 3 is what we want.
net/ipv4/netfilter/nf_log_arp.c:77:6: symbol 'nf_log_arp_packet' was not declared. Should it be static?
yes
net/ipv4/netfilter/nf_reject_ipv4.c:17:6: symbol 'nf_send_reset' was not declared. Should it be static?
no; add include
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/nf_log_arp.c | 12 | ||||
-rw-r--r-- | net/ipv4/netfilter/nf_reject_ipv4.c | 1 | ||||
-rw-r--r-- | net/ipv4/netfilter/nft_reject_ipv4.c | 7 |
3 files changed, 10 insertions, 10 deletions
diff --git a/net/ipv4/netfilter/nf_log_arp.c b/net/ipv4/netfilter/nf_log_arp.c index 0c8799a0c9e4..d059182c1466 100644 --- a/net/ipv4/netfilter/nf_log_arp.c +++ b/net/ipv4/netfilter/nf_log_arp.c | |||
@@ -75,12 +75,12 @@ static void dump_arp_packet(struct nf_log_buf *m, | |||
75 | ap->mac_src, ap->ip_src, ap->mac_dst, ap->ip_dst); | 75 | ap->mac_src, ap->ip_src, ap->mac_dst, ap->ip_dst); |
76 | } | 76 | } |
77 | 77 | ||
78 | void nf_log_arp_packet(struct net *net, u_int8_t pf, | 78 | static void nf_log_arp_packet(struct net *net, u_int8_t pf, |
79 | unsigned int hooknum, const struct sk_buff *skb, | 79 | unsigned int hooknum, const struct sk_buff *skb, |
80 | const struct net_device *in, | 80 | const struct net_device *in, |
81 | const struct net_device *out, | 81 | const struct net_device *out, |
82 | const struct nf_loginfo *loginfo, | 82 | const struct nf_loginfo *loginfo, |
83 | const char *prefix) | 83 | const char *prefix) |
84 | { | 84 | { |
85 | struct nf_log_buf *m; | 85 | struct nf_log_buf *m; |
86 | 86 | ||
diff --git a/net/ipv4/netfilter/nf_reject_ipv4.c b/net/ipv4/netfilter/nf_reject_ipv4.c index 92b303dbd5fc..cdcb9a5d6786 100644 --- a/net/ipv4/netfilter/nf_reject_ipv4.c +++ b/net/ipv4/netfilter/nf_reject_ipv4.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <net/tcp.h> | 11 | #include <net/tcp.h> |
12 | #include <net/route.h> | 12 | #include <net/route.h> |
13 | #include <net/dst.h> | 13 | #include <net/dst.h> |
14 | #include <net/netfilter/ipv4/nf_reject.h> | ||
14 | #include <linux/netfilter_ipv4.h> | 15 | #include <linux/netfilter_ipv4.h> |
15 | 16 | ||
16 | /* Send RST reply */ | 17 | /* Send RST reply */ |
diff --git a/net/ipv4/netfilter/nft_reject_ipv4.c b/net/ipv4/netfilter/nft_reject_ipv4.c index ed33299c56d1..d729542bd1b7 100644 --- a/net/ipv4/netfilter/nft_reject_ipv4.c +++ b/net/ipv4/netfilter/nft_reject_ipv4.c | |||
@@ -19,9 +19,9 @@ | |||
19 | #include <net/netfilter/ipv4/nf_reject.h> | 19 | #include <net/netfilter/ipv4/nf_reject.h> |
20 | #include <net/netfilter/nft_reject.h> | 20 | #include <net/netfilter/nft_reject.h> |
21 | 21 | ||
22 | void nft_reject_ipv4_eval(const struct nft_expr *expr, | 22 | static void nft_reject_ipv4_eval(const struct nft_expr *expr, |
23 | struct nft_data data[NFT_REG_MAX + 1], | 23 | struct nft_data data[NFT_REG_MAX + 1], |
24 | const struct nft_pktinfo *pkt) | 24 | const struct nft_pktinfo *pkt) |
25 | { | 25 | { |
26 | struct nft_reject *priv = nft_expr_priv(expr); | 26 | struct nft_reject *priv = nft_expr_priv(expr); |
27 | 27 | ||
@@ -36,7 +36,6 @@ void nft_reject_ipv4_eval(const struct nft_expr *expr, | |||
36 | 36 | ||
37 | data[NFT_REG_VERDICT].verdict = NF_DROP; | 37 | data[NFT_REG_VERDICT].verdict = NF_DROP; |
38 | } | 38 | } |
39 | EXPORT_SYMBOL_GPL(nft_reject_ipv4_eval); | ||
40 | 39 | ||
41 | static struct nft_expr_type nft_reject_ipv4_type; | 40 | static struct nft_expr_type nft_reject_ipv4_type; |
42 | static const struct nft_expr_ops nft_reject_ipv4_ops = { | 41 | static const struct nft_expr_ops nft_reject_ipv4_ops = { |