|
On Fri, Oct 08, 2010 at 01:17:02PM +0200, Hans Schillstrom wrote:
> This patch just contains ip_vs_ctl
>
> Signed-off-by:Hans Schillstrom <hans.schillstrom@xxxxxxxxxxxx>
>
> diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
> index ca8ec8c..7e99cbc 100644
> --- a/net/netfilter/ipvs/ip_vs_ctl.c
> +++ b/net/netfilter/ipvs/ip_vs_ctl.c
[ snip ]
> @@ -2680,10 +2664,15 @@ static int ip_vs_genl_dump_services(struct sk_buff
> *skb,
> int idx = 0, i;
> int start = cb->args[0];
> struct ip_vs_service *svc;
> -
> + struct net *net = skb->sk->sk_net;
skb->sk->sk_net needs CONFIG_NS_NET.
Is your plan for IPVS to unconditionally depend on CONFIG_NS_NET?
It would be nice to avoid that, but I fear it will be too messy.
> + struct netns_ipvs *ipvs;
> + if (!net)
> + net = dev_net(skb->dev);
> + BUG_ON(!net);
> + ipvs = net->ipvs;
> mutex_lock(&__ip_vs_mutex);
> for (i = 0; i < IP_VS_SVC_TAB_SIZE; i++) {
> - list_for_each_entry(svc, &ip_vs_svc_table[i], s_list) {
> + list_for_each_entry(svc, &ipvs->ctl_svc_table[i], s_list) {
> if (++idx <= start)
> continue;
> if (ip_vs_genl_dump_service(skb, svc, cb) < 0) {
[ snip ]
--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
