OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 10... Line 10...
10 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> 10 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
11 --- 11 ---
Line 12... Line 12...
12   12  
13 --- a/include/linux/netfilter.h 13 --- a/include/linux/netfilter.h
14 +++ b/include/linux/netfilter.h 14 +++ b/include/linux/netfilter.h
15 @@ -309,16 +309,6 @@ int skb_make_writable(struct sk_buff *sk 15 @@ -272,16 +272,6 @@ int skb_make_writable(struct sk_buff *sk
16 struct flowi; 16 struct flowi;
Line 17... Line 17...
17 struct nf_queue_entry; 17 struct nf_queue_entry;
18 18
Line 27... Line 27...
27 -} 27 -}
28 - 28 -
29 __sum16 nf_checksum(struct sk_buff *skb, unsigned int hook, 29 __sum16 nf_checksum(struct sk_buff *skb, unsigned int hook,
30 unsigned int dataoff, u_int8_t protocol, 30 unsigned int dataoff, u_int8_t protocol,
31 unsigned short family); 31 unsigned short family);
32 @@ -330,9 +320,6 @@ int nf_route(struct net *net, struct dst 32 @@ -293,9 +283,6 @@ int nf_route(struct net *net, struct dst
33 bool strict, unsigned short family); 33 bool strict, unsigned short family);
34 int nf_reroute(struct sk_buff *skb, struct nf_queue_entry *entry); 34 int nf_reroute(struct sk_buff *skb, struct nf_queue_entry *entry);
Line 35... Line 35...
35 35
36 -int nf_register_afinfo(const struct nf_afinfo *afinfo); 36 -int nf_register_afinfo(const struct nf_afinfo *afinfo);
Line 100... Line 100...
100 - return nf_register_afinfo(&nf_ip_afinfo); 100 - return nf_register_afinfo(&nf_ip_afinfo);
101 -} 101 -}
102 -subsys_initcall(ipv4_netfilter_init); 102 -subsys_initcall(ipv4_netfilter_init);
103 --- a/net/ipv6/netfilter.c 103 --- a/net/ipv6/netfilter.c
104 +++ b/net/ipv6/netfilter.c 104 +++ b/net/ipv6/netfilter.c
105 @@ -176,14 +176,10 @@ static const struct nf_ipv6_ops ipv6ops 105 @@ -175,14 +175,10 @@ static const struct nf_ipv6_ops ipv6ops
106 .reroute = nf_ip6_reroute, 106 .reroute = nf_ip6_reroute,
107 }; 107 };
Line 108... Line 108...
108 108
109 -static const struct nf_afinfo nf_ip6_afinfo = { 109 -static const struct nf_afinfo nf_ip6_afinfo = {
Line 116... Line 116...
116 - return nf_register_afinfo(&nf_ip6_afinfo); 116 - return nf_register_afinfo(&nf_ip6_afinfo);
117 + return 0; 117 + return 0;
118 } 118 }
Line 119... Line 119...
119 119
120 /* This can be called from inet6_init() on errors, so it cannot 120 /* This can be called from inet6_init() on errors, so it cannot
121 @@ -192,5 +188,4 @@ int __init ipv6_netfilter_init(void) 121 @@ -191,5 +187,4 @@ int __init ipv6_netfilter_init(void)
122 void ipv6_netfilter_fini(void) 122 void ipv6_netfilter_fini(void)
123 { 123 {
124 RCU_INIT_POINTER(nf_ipv6_ops, NULL); 124 RCU_INIT_POINTER(nf_ipv6_ops, NULL);
125 - nf_unregister_afinfo(&nf_ip6_afinfo); 125 - nf_unregister_afinfo(&nf_ip6_afinfo);