From patchwork Tue Feb 23 23:08:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jamal X-Patchwork-Id: 46101 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 B031DB7CC1 for ; Wed, 24 Feb 2010 10:08:20 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754671Ab0BWXIP (ORCPT ); Tue, 23 Feb 2010 18:08:15 -0500 Received: from mail-pw0-f46.google.com ([209.85.160.46]:64821 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754646Ab0BWXIO (ORCPT ); Tue, 23 Feb 2010 18:08:14 -0500 Received: by pwj8 with SMTP id 8so4287863pwj.19 for ; Tue, 23 Feb 2010 15:08:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references; bh=IJ7H4jbXbT/l+2sSJnCQiLXxCNXj46xwdFq5EVV20rg=; b=M6CH37LPOnfce3DbcRH+QC9OIIbbddhiLtmDxOVva0NCPxdgqCGrS9vOysrVsSdePW B7VT81CmhY5XvOKxIWX4lybcQZVIMxlPHv3VAcimX5BGsrsREDaesOScLiyN0YWnT+z7 sDYCsPguJSd6HFqjZsPtvp5VeIsS1JveED7yY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=edMOR4XEdHhHmLvj7O+JZOgnlpsIxFIlioTmRh/4dtC8bM5et+eBEIzCes2m1auxR0 3qc+vpzRbWV0NcWARQSJijphM28Ls4FJEHc2d5UcRtl80iDa5b86AGkr5jjIuXn/53di AU804FYNFPek+l2E0sXB3JGjzBdybIed+/9JM= Received: by 10.142.9.37 with SMTP id 37mr1934171wfi.101.1266966493997; Tue, 23 Feb 2010 15:08:13 -0800 (PST) Received: from localhost.localdomain (CPE0030ab124d2f-CM001bd7a7f1a0.cpe.net.cable.rogers.com [99.240.66.42]) by mx.google.com with ESMTPS id 19sm1211017pwi.8.2010.02.23.15.08.12 (version=SSLv3 cipher=RC4-MD5); Tue, 23 Feb 2010 15:08:13 -0800 (PST) From: jamal To: davem@davemloft.net Cc: netdev@vger.kernel.org, Jamal Hadi Salim Subject: [net-next-2.6 PATCH 1/1] xfrm: clone mark when cloning policy Date: Tue, 23 Feb 2010 18:08:04 -0500 Message-Id: <1266966484-1750-1-git-send-email-hadi@cyberus.ca> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jamal Hadi Salim When we clone the SP, we should also clone the mark. Useful for socket based SPs. Signed-off-by: Jamal Hadi Salim --- net/xfrm/xfrm_policy.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 2a6e646..34a5ef8 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -1154,6 +1154,7 @@ static struct xfrm_policy *clone_policy(struct xfrm_policy *old, int dir) } newp->lft = old->lft; newp->curlft = old->curlft; + newp->mark = old->mark; newp->action = old->action; newp->flags = old->flags; newp->xfrm_nr = old->xfrm_nr;