diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-12-17 22:42:27 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:59:05 -0800 |
| commit | 1e796fda00f06bac584f0e4ad8750ab9430d79d3 (patch) | |
| tree | c397d3c84060a0a3dcc83f4bdbb3a470cfd8db06 /net | |
| parent | 90a9ba8dd90bcffe279d3272545bccba6dcc8d7c (diff) | |
[NETFILTER]: constify nf_afinfo
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter.c | 2 | ||||
| -rw-r--r-- | net/ipv6/netfilter.c | 2 | ||||
| -rw-r--r-- | net/netfilter/core.c | 6 | ||||
| -rw-r--r-- | net/netfilter/nf_conntrack_h323_main.c | 2 | ||||
| -rw-r--r-- | net/netfilter/nf_queue.c | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c index 7bf5e4a199f0..4011f8f987c0 100644 --- a/net/ipv4/netfilter.c +++ b/net/ipv4/netfilter.c @@ -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, diff --git a/net/ipv6/netfilter.c b/net/ipv6/netfilter.c index 945e6ae19569..2e06724dc348 100644 --- a/net/ipv6/netfilter.c +++ b/net/ipv6/netfilter.c @@ -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, diff --git a/net/netfilter/core.c b/net/netfilter/core.c index 95e18635ce7a..e0263445484a 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -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); diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c index c550257b5462..b636ca60a770 100644 --- a/net/netfilter/nf_conntrack_h323_main.c +++ b/net/netfilter/nf_conntrack_h323_main.c @@ -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; diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c index 77965114b091..bfc2928c1912 100644 --- a/net/netfilter/nf_queue.c +++ b/net/netfilter/nf_queue.c @@ -119,7 +119,7 @@ static int __nf_queue(struct sk_buff *skb, struct net_device *physindev; struct net_device *physoutdev; #endif - struct nf_afinfo *afinfo; + const struct nf_afinfo *afinfo; const struct nf_queue_handler *qh; /* QUEUE == DROP if noone is waiting, to be safe. */ @@ -233,7 +233,7 @@ void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict) { struct sk_buff *skb = entry->skb; struct list_head *elem = &entry->elem->list; - struct nf_afinfo *afinfo; + const struct nf_afinfo *afinfo; rcu_read_lock(); |