OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 16... Line 16...
16 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> 16 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
17 --- 17 ---
Line 18... Line 18...
18   18  
19 --- a/include/linux/netfilter.h 19 --- a/include/linux/netfilter.h
20 +++ b/include/linux/netfilter.h 20 +++ b/include/linux/netfilter.h
Line 21... Line 21...
21 @@ -311,11 +311,6 @@ struct nf_queue_entry; 21 @@ -274,11 +274,6 @@ struct nf_queue_entry;
22 22
23 struct nf_afinfo { 23 struct nf_afinfo {
24 unsigned short family; 24 unsigned short family;
Line 28... Line 28...
28 - unsigned int len, 28 - unsigned int len,
29 - u_int8_t protocol); 29 - u_int8_t protocol);
30 int (*route)(struct net *net, struct dst_entry **dst, 30 int (*route)(struct net *net, struct dst_entry **dst,
31 struct flowi *fl, bool strict); 31 struct flowi *fl, bool strict);
32 void (*saveroute)(const struct sk_buff *skb, 32 void (*saveroute)(const struct sk_buff *skb,
33 @@ -335,22 +330,9 @@ __sum16 nf_checksum(struct sk_buff *skb, 33 @@ -298,22 +293,9 @@ __sum16 nf_checksum(struct sk_buff *skb,
34 unsigned int dataoff, u_int8_t protocol, 34 unsigned int dataoff, u_int8_t protocol,
35 unsigned short family); 35 unsigned short family);
Line 36... Line 36...
36 36
37 -static inline __sum16 37 -static inline __sum16
Line 149... Line 149...
149 .route = nf_ip_route, 149 .route = nf_ip_route,
150 .saveroute = nf_ip_saveroute, 150 .saveroute = nf_ip_saveroute,
151 .reroute = nf_ip_reroute, 151 .reroute = nf_ip_reroute,
152 --- a/net/ipv6/netfilter.c 152 --- a/net/ipv6/netfilter.c
153 +++ b/net/ipv6/netfilter.c 153 +++ b/net/ipv6/netfilter.c
154 @@ -192,15 +192,15 @@ static __sum16 nf_ip6_checksum_partial(s 154 @@ -191,15 +191,15 @@ static __sum16 nf_ip6_checksum_partial(s
155 }; 155 };
Line 156... Line 156...
156 156
157 static const struct nf_ipv6_ops ipv6ops = { 157 static const struct nf_ipv6_ops ipv6ops = {
158 - .chk_addr = ipv6_chk_addr, 158 - .chk_addr = ipv6_chk_addr,