From patchwork Mon Jan 25 20:39:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Dobriyan X-Patchwork-Id: 43661 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5BAD7B7CB8 for ; Tue, 26 Jan 2010 07:39:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752802Ab0AYUjR (ORCPT ); Mon, 25 Jan 2010 15:39:17 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752582Ab0AYUjR (ORCPT ); Mon, 25 Jan 2010 15:39:17 -0500 Received: from mail-fx0-f220.google.com ([209.85.220.220]:49513 "EHLO mail-fx0-f220.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751852Ab0AYUjQ (ORCPT ); Mon, 25 Jan 2010 15:39:16 -0500 Received: by fxm20 with SMTP id 20so4007778fxm.21 for ; Mon, 25 Jan 2010 12:39:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=yfyZCz+ot3ucDLVzYjTlaAch6JkPBCkHCkByEzQQKss=; b=Inj7DCGHOsoJtWSjUdHtqoEbORqwbYBE3iO57R4De1OOItwgMphVvV+dqXcCPTnpCL EMx2vjOib5WPAnzvu8iEMm5s8VgNirxlYQcc63hneCmdvnPZczuFjMjypQ+kGiQQUZPY x2B+8rNY9YuB+HZ3lq/GftvqO15taLNmvKEeg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=AczpytNqI/2hA5jS9rJqwHVXlIbNl70J7YjjcmK0AVveTRuQRMVBDVDDk4aVoqWGe+ riiGmFqkoWjnXFDkG/TyvkIYSjyKVWulH4XDezSpVy3umbNBVlS3OeIxq5viQh8c3CA5 ys234T3Q4dgkFMRgfkunAgB1nUyg4Kg9cQVQM= Received: by 10.223.3.135 with SMTP id 7mr7457674fan.21.1264451954218; Mon, 25 Jan 2010 12:39:14 -0800 (PST) Received: from x200 ([93.85.96.96]) by mx.google.com with ESMTPS id h2sm7156716fkh.32.2010.01.25.12.39.12 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 25 Jan 2010 12:39:13 -0800 (PST) Date: Mon, 25 Jan 2010 22:39:09 +0200 From: Alexey Dobriyan To: davem@davemloft.net Cc: netdev@vger.kernel.org, herbert@gondor.apana.org.au Subject: [PATCH 4/4] netns xfrm: ipcomp6 support Message-ID: <20100125203909.GC6145@x200> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexey Dobriyan --- net/ipv6/ipcomp6.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/net/ipv6/ipcomp6.c +++ b/net/ipv6/ipcomp6.c @@ -53,6 +53,7 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, u8 type, u8 code, int offset, __be32 info) { + struct net *net = dev_net(skb->dev); __be32 spi; struct ipv6hdr *iph = (struct ipv6hdr*)skb->data; struct ip_comp_hdr *ipcomph = @@ -63,7 +64,7 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, return; spi = htonl(ntohs(ipcomph->cpi)); - x = xfrm_state_lookup(&init_net, (xfrm_address_t *)&iph->daddr, spi, IPPROTO_COMP, AF_INET6); + x = xfrm_state_lookup(net, (xfrm_address_t *)&iph->daddr, spi, IPPROTO_COMP, AF_INET6); if (!x) return; @@ -74,14 +75,15 @@ static void ipcomp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, static struct xfrm_state *ipcomp6_tunnel_create(struct xfrm_state *x) { + struct net *net = xs_net(x); struct xfrm_state *t = NULL; - t = xfrm_state_alloc(&init_net); + t = xfrm_state_alloc(net); if (!t) goto out; t->id.proto = IPPROTO_IPV6; - t->id.spi = xfrm6_tunnel_alloc_spi(&init_net, (xfrm_address_t *)&x->props.saddr); + t->id.spi = xfrm6_tunnel_alloc_spi(net, (xfrm_address_t *)&x->props.saddr); if (!t->id.spi) goto error; @@ -108,13 +110,14 @@ error: static int ipcomp6_tunnel_attach(struct xfrm_state *x) { + struct net *net = xs_net(x); int err = 0; struct xfrm_state *t = NULL; __be32 spi; - spi = xfrm6_tunnel_spi_lookup(&init_net, (xfrm_address_t *)&x->props.saddr); + spi = xfrm6_tunnel_spi_lookup(net, (xfrm_address_t *)&x->props.saddr); if (spi) - t = xfrm_state_lookup(&init_net, (xfrm_address_t *)&x->id.daddr, + t = xfrm_state_lookup(net, (xfrm_address_t *)&x->id.daddr, spi, IPPROTO_IPV6, AF_INET6); if (!t) { t = ipcomp6_tunnel_create(x);