diff options
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_conn.c')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_conn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c index a7aba6a4697..b2024c94234 100644 --- a/net/netfilter/ipvs/ip_vs_conn.c +++ b/net/netfilter/ipvs/ip_vs_conn.c | |||
@@ -804,7 +804,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, | |||
804 | struct ip_vs_dest *dest, __u32 fwmark) | 804 | struct ip_vs_dest *dest, __u32 fwmark) |
805 | { | 805 | { |
806 | struct ip_vs_conn *cp; | 806 | struct ip_vs_conn *cp; |
807 | struct ip_vs_protocol *pp = ip_vs_proto_get(p->protocol); | 807 | struct ip_vs_proto_data *pd = ip_vs_proto_data_get(&init_net, p->protocol); |
808 | 808 | ||
809 | cp = kmem_cache_zalloc(ip_vs_conn_cachep, GFP_ATOMIC); | 809 | cp = kmem_cache_zalloc(ip_vs_conn_cachep, GFP_ATOMIC); |
810 | if (cp == NULL) { | 810 | if (cp == NULL) { |
@@ -863,8 +863,8 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, | |||
863 | #endif | 863 | #endif |
864 | ip_vs_bind_xmit(cp); | 864 | ip_vs_bind_xmit(cp); |
865 | 865 | ||
866 | if (unlikely(pp && atomic_read(&pp->appcnt))) | 866 | if (unlikely(pd && atomic_read(&pd->appcnt))) |
867 | ip_vs_bind_app(cp, pp); | 867 | ip_vs_bind_app(cp, pd->pp); |
868 | 868 | ||
869 | /* | 869 | /* |
870 | * Allow conntrack to be preserved. By default, conntrack | 870 | * Allow conntrack to be preserved. By default, conntrack |