diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2009-04-14 08:28:48 -0400 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2009-05-08 04:30:47 -0400 |
commit | 4ba351cf866257de3da3fbc8d2bcc3907ee9460f (patch) | |
tree | b0b1be24330c08e309edc9c1049d124cb52d74c6 /net/ipv4 | |
parent | 4b1e27e99f354ad90a1cbdda352b84763e70ac78 (diff) |
netfilter: xtables: use NFPROTO_ in standard targets
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/ip_tables.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index 3051dda67cdd..5abc27689f83 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c | |||
@@ -2158,7 +2158,7 @@ static bool icmp_checkentry(const struct xt_mtchk_param *par) | |||
2158 | static struct xt_target ipt_standard_target __read_mostly = { | 2158 | static struct xt_target ipt_standard_target __read_mostly = { |
2159 | .name = IPT_STANDARD_TARGET, | 2159 | .name = IPT_STANDARD_TARGET, |
2160 | .targetsize = sizeof(int), | 2160 | .targetsize = sizeof(int), |
2161 | .family = AF_INET, | 2161 | .family = NFPROTO_IPV4, |
2162 | #ifdef CONFIG_COMPAT | 2162 | #ifdef CONFIG_COMPAT |
2163 | .compatsize = sizeof(compat_int_t), | 2163 | .compatsize = sizeof(compat_int_t), |
2164 | .compat_from_user = compat_standard_from_user, | 2164 | .compat_from_user = compat_standard_from_user, |
@@ -2170,7 +2170,7 @@ static struct xt_target ipt_error_target __read_mostly = { | |||
2170 | .name = IPT_ERROR_TARGET, | 2170 | .name = IPT_ERROR_TARGET, |
2171 | .target = ipt_error, | 2171 | .target = ipt_error, |
2172 | .targetsize = IPT_FUNCTION_MAXNAMELEN, | 2172 | .targetsize = IPT_FUNCTION_MAXNAMELEN, |
2173 | .family = AF_INET, | 2173 | .family = NFPROTO_IPV4, |
2174 | }; | 2174 | }; |
2175 | 2175 | ||
2176 | static struct nf_sockopt_ops ipt_sockopts = { | 2176 | static struct nf_sockopt_ops ipt_sockopts = { |
@@ -2196,7 +2196,7 @@ static struct xt_match icmp_matchstruct __read_mostly = { | |||
2196 | .matchsize = sizeof(struct ipt_icmp), | 2196 | .matchsize = sizeof(struct ipt_icmp), |
2197 | .checkentry = icmp_checkentry, | 2197 | .checkentry = icmp_checkentry, |
2198 | .proto = IPPROTO_ICMP, | 2198 | .proto = IPPROTO_ICMP, |
2199 | .family = AF_INET, | 2199 | .family = NFPROTO_IPV4, |
2200 | }; | 2200 | }; |
2201 | 2201 | ||
2202 | static int __net_init ip_tables_net_init(struct net *net) | 2202 | static int __net_init ip_tables_net_init(struct net *net) |