aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ipv4/netfilter/ipt_CLUSTERIP.c6
-rw-r--r--net/netfilter/xt_NFQUEUE.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 0886f96c736b..a20bee75b02c 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -401,9 +401,9 @@ static bool clusterip_tg_check(const struct xt_tgchk_param *par)
401 } 401 }
402 cipinfo->config = config; 402 cipinfo->config = config;
403 403
404 if (nf_ct_l3proto_try_module_get(par->target->family) < 0) { 404 if (nf_ct_l3proto_try_module_get(par->family) < 0) {
405 printk(KERN_WARNING "can't load conntrack support for " 405 printk(KERN_WARNING "can't load conntrack support for "
406 "proto=%u\n", par->target->family); 406 "proto=%u\n", par->family);
407 return false; 407 return false;
408 } 408 }
409 409
@@ -421,7 +421,7 @@ static void clusterip_tg_destroy(const struct xt_tgdtor_param *par)
421 421
422 clusterip_config_put(cipinfo->config); 422 clusterip_config_put(cipinfo->config);
423 423
424 nf_ct_l3proto_module_put(par->target->family); 424 nf_ct_l3proto_module_put(par->family);
425} 425}
426 426
427#ifdef CONFIG_COMPAT 427#ifdef CONFIG_COMPAT
diff --git a/net/netfilter/xt_NFQUEUE.c b/net/netfilter/xt_NFQUEUE.c
index a37e2166858e..7cc0de63aa0f 100644
--- a/net/netfilter/xt_NFQUEUE.c
+++ b/net/netfilter/xt_NFQUEUE.c
@@ -71,10 +71,10 @@ nfqueue_tg_v1(struct sk_buff *skb, const struct xt_target_param *par)
71 u32 queue = info->queuenum; 71 u32 queue = info->queuenum;
72 72
73 if (info->queues_total > 1) { 73 if (info->queues_total > 1) {
74 if (par->target->family == NFPROTO_IPV4) 74 if (par->family == NFPROTO_IPV4)
75 queue = hash_v4(skb) % info->queues_total + queue; 75 queue = hash_v4(skb) % info->queues_total + queue;
76#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE) 76#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE)
77 else if (par->target->family == NFPROTO_IPV6) 77 else if (par->family == NFPROTO_IPV6)
78 queue = hash_v6(skb) % info->queues_total + queue; 78 queue = hash_v6(skb) % info->queues_total + queue;
79#endif 79#endif
80 } 80 }