Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56768644 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

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: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent baf4750d

net/bridge/br_netfilter.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <net/ip.h>

#include <net/ipv6.h>

#include <net/route.h>

#include <net/netfilter/br_netfilter.h>



#include <asm/uaccess.h>

#include "br_private.h"

net/ipv4/netfilter/nf_log_arp.c

+6 −6
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static void dump_arp_packet(struct nf_log_buf *m, 
		       ap->mac_src, ap->ip_src, ap->mac_dst, ap->ip_dst);

}



void nf_log_arp_packet(struct net *net, u_int8_t pf,

static void nf_log_arp_packet(struct net *net, u_int8_t pf,

			      unsigned int hooknum, const struct sk_buff *skb,

			      const struct net_device *in,

			      const struct net_device *out,

net/ipv4/netfilter/nf_reject_ipv4.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <net/tcp.h>

#include <net/route.h>

#include <net/dst.h>

#include <net/netfilter/ipv4/nf_reject.h>

#include <linux/netfilter_ipv4.h>



/* Send RST reply */

net/ipv4/netfilter/nft_reject_ipv4.c

+3 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <net/netfilter/ipv4/nf_reject.h>

#include <net/netfilter/nft_reject.h>



void nft_reject_ipv4_eval(const struct nft_expr *expr,

static void nft_reject_ipv4_eval(const struct nft_expr *expr,

				 struct nft_data data[NFT_REG_MAX + 1],

				 const struct nft_pktinfo *pkt)

{
@@ -36,7 +36,6 @@ void nft_reject_ipv4_eval(const struct nft_expr *expr, 


	data[NFT_REG_VERDICT].verdict = NF_DROP;

}

EXPORT_SYMBOL_GPL(nft_reject_ipv4_eval);



static struct nft_expr_type nft_reject_ipv4_type;

static const struct nft_expr_ops nft_reject_ipv4_ops = {

net/ipv6/netfilter/nf_reject_ipv6.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <net/ip6_route.h>

#include <net/ip6_fib.h>

#include <net/ip6_checksum.h>

#include <net/netfilter/ipv6/nf_reject.h>

#include <linux/netfilter_ipv6.h>



void nf_send_reset6(struct net *net, struct sk_buff *oldskb, int hook)