OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 16... Line 16...
16 --- 16 ---
17 create mode 100644 net/netfilter/utils.c 17 create mode 100644 net/netfilter/utils.c
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,8 +311,6 @@ struct nf_queue_entry; 21 @@ -274,8 +274,6 @@ struct nf_queue_entry;
22 22
23 struct nf_afinfo { 23 struct nf_afinfo {
24 unsigned short family; 24 unsigned short family;
25 - __sum16 (*checksum)(struct sk_buff *skb, unsigned int hook, 25 - __sum16 (*checksum)(struct sk_buff *skb, unsigned int hook,
26 - unsigned int dataoff, u_int8_t protocol); 26 - unsigned int dataoff, u_int8_t protocol);
27 __sum16 (*checksum_partial)(struct sk_buff *skb, 27 __sum16 (*checksum_partial)(struct sk_buff *skb,
28 unsigned int hook, 28 unsigned int hook,
29 unsigned int dataoff, 29 unsigned int dataoff,
30 @@ -333,20 +331,9 @@ static inline const struct nf_afinfo *nf 30 @@ -296,20 +294,9 @@ static inline const struct nf_afinfo *nf
Line 31... Line 31...
31 return rcu_dereference(nf_afinfo[family]); 31 return rcu_dereference(nf_afinfo[family]);
32 } 32 }
Line 114... Line 114...
114 .checksum_partial = nf_ip_checksum_partial, 114 .checksum_partial = nf_ip_checksum_partial,
115 .route = nf_ip_route, 115 .route = nf_ip_route,
116 .saveroute = nf_ip_saveroute, 116 .saveroute = nf_ip_saveroute,
117 --- a/net/ipv6/netfilter.c 117 --- a/net/ipv6/netfilter.c
118 +++ b/net/ipv6/netfilter.c 118 +++ b/net/ipv6/netfilter.c
119 @@ -194,12 +194,12 @@ static __sum16 nf_ip6_checksum_partial(s 119 @@ -193,12 +193,12 @@ static __sum16 nf_ip6_checksum_partial(s
120 static const struct nf_ipv6_ops ipv6ops = { 120 static const struct nf_ipv6_ops ipv6ops = {
121 .chk_addr = ipv6_chk_addr, 121 .chk_addr = ipv6_chk_addr,
122 .route_input = ip6_route_input, 122 .route_input = ip6_route_input,
123 - .fragment = ip6_fragment 123 - .fragment = ip6_fragment
124 + .fragment = ip6_fragment, 124 + .fragment = ip6_fragment,