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

Commit 1e796fda authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: constify nf_afinfo 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 90a9ba8d

include/linux/netfilter.h

+5 −5
Original line number Diff line number Diff line
@@ -226,8 +226,8 @@ struct nf_afinfo { 
	int		route_key_size;

};



extern struct nf_afinfo *nf_afinfo[];

static inline struct nf_afinfo *nf_get_afinfo(unsigned short family)

extern const struct nf_afinfo *nf_afinfo[NPROTO];

static inline const struct nf_afinfo *nf_get_afinfo(unsigned short family)

{

	return rcu_dereference(nf_afinfo[family]);

}
@@ -236,7 +236,7 @@ static inline __sum16 
nf_checksum(struct sk_buff *skb, unsigned int hook, unsigned int dataoff,

	    u_int8_t protocol, unsigned short family)

{

	struct nf_afinfo *afinfo;

	const struct nf_afinfo *afinfo;

	__sum16 csum = 0;



	rcu_read_lock();
@@ -247,8 +247,8 @@ nf_checksum(struct sk_buff *skb, unsigned int hook, unsigned int dataoff, 
	return csum;

}



extern int nf_register_afinfo(struct nf_afinfo *afinfo);

extern void nf_unregister_afinfo(struct nf_afinfo *afinfo);

extern int nf_register_afinfo(const struct nf_afinfo *afinfo);

extern void nf_unregister_afinfo(const struct nf_afinfo *afinfo);



#include <net/flow.h>

extern void (*ip_nat_decode_session)(struct sk_buff *, struct flowi *);

net/ipv4/netfilter.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static int nf_ip_route(struct dst_entry **dst, struct flowi *fl) 
	return ip_route_output_key((struct rtable **)dst, fl);

}



static struct nf_afinfo nf_ip_afinfo = {

static const struct nf_afinfo nf_ip_afinfo = {

	.family		= AF_INET,

	.checksum	= nf_ip_checksum,

	.route		= nf_ip_route,

net/ipv6/netfilter.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ __sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook, 


EXPORT_SYMBOL(nf_ip6_checksum);



static struct nf_afinfo nf_ip6_afinfo = {

static const struct nf_afinfo nf_ip6_afinfo = {

	.family		= AF_INET6,

	.checksum	= nf_ip6_checksum,

	.route		= nf_ip6_route,

net/netfilter/core.c

+3 −3
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 


static DEFINE_MUTEX(afinfo_mutex);



struct nf_afinfo *nf_afinfo[NPROTO] __read_mostly;

const struct nf_afinfo *nf_afinfo[NPROTO] __read_mostly;

EXPORT_SYMBOL(nf_afinfo);



int nf_register_afinfo(struct nf_afinfo *afinfo)

int nf_register_afinfo(const struct nf_afinfo *afinfo)

{

	int err;
@@ -42,7 +42,7 @@ int nf_register_afinfo(struct nf_afinfo *afinfo) 
}

EXPORT_SYMBOL_GPL(nf_register_afinfo);



void nf_unregister_afinfo(struct nf_afinfo *afinfo)

void nf_unregister_afinfo(const struct nf_afinfo *afinfo)

{

	mutex_lock(&afinfo_mutex);

	rcu_assign_pointer(nf_afinfo[afinfo->family], NULL);

net/netfilter/nf_conntrack_h323_main.c

+1 −1
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ static int callforward_do_filter(union nf_conntrack_address *src, 
				 union nf_conntrack_address *dst,

				 int family)

{

	struct nf_afinfo *afinfo;

	const struct nf_afinfo *afinfo;

	struct flowi fl1, fl2;

	int ret = 0;