netfilter: xtables: make use of caller family rather than target family
Supplement to aa5fa31857
.
The semantic patch for this change is:
// <smpl>
@@
struct xt_target_param *par;
@@
-par->target->family
+par->family
@@
struct xt_tgchk_param *par;
@@
-par->target->family
+par->family
@@
struct xt_tgdtor_param *par;
@@
-par->target->family
+par->family
// </smpl>
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
This commit is contained in:
parent
2c46cd8163
commit
0d34545563
2 changed files with 5 additions and 5 deletions
|
@ -401,9 +401,9 @@ static bool clusterip_tg_check(const struct xt_tgchk_param *par)
|
||||||
}
|
}
|
||||||
cipinfo->config = config;
|
cipinfo->config = config;
|
||||||
|
|
||||||
if (nf_ct_l3proto_try_module_get(par->target->family) < 0) {
|
if (nf_ct_l3proto_try_module_get(par->family) < 0) {
|
||||||
printk(KERN_WARNING "can't load conntrack support for "
|
printk(KERN_WARNING "can't load conntrack support for "
|
||||||
"proto=%u\n", par->target->family);
|
"proto=%u\n", par->family);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -421,7 +421,7 @@ static void clusterip_tg_destroy(const struct xt_tgdtor_param *par)
|
||||||
|
|
||||||
clusterip_config_put(cipinfo->config);
|
clusterip_config_put(cipinfo->config);
|
||||||
|
|
||||||
nf_ct_l3proto_module_put(par->target->family);
|
nf_ct_l3proto_module_put(par->family);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_COMPAT
|
#ifdef CONFIG_COMPAT
|
||||||
|
|
|
@ -71,10 +71,10 @@ nfqueue_tg_v1(struct sk_buff *skb, const struct xt_target_param *par)
|
||||||
u32 queue = info->queuenum;
|
u32 queue = info->queuenum;
|
||||||
|
|
||||||
if (info->queues_total > 1) {
|
if (info->queues_total > 1) {
|
||||||
if (par->target->family == NFPROTO_IPV4)
|
if (par->family == NFPROTO_IPV4)
|
||||||
queue = hash_v4(skb) % info->queues_total + queue;
|
queue = hash_v4(skb) % info->queues_total + queue;
|
||||||
#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
|
#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
|
||||||
else if (par->target->family == NFPROTO_IPV6)
|
else if (par->family == NFPROTO_IPV6)
|
||||||
queue = hash_v6(skb) % info->queues_total + queue;
|
queue = hash_v6(skb) % info->queues_total + queue;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue