summaryrefslogtreecommitdiff
path: root/net/key
diff options
context:
space:
mode:
authorJamal Hadi Salim <hadi@cyberus.ca>2010-02-22 11:32:57 +0000
committerDavid S. Miller <davem@davemloft.net>2010-02-22 16:21:12 -0800
commit8ca2e93b557f2a0b35f7769038abf600177e1122 (patch)
tree2b25012de07a48c33db0a191924d6e5fcc99c22a /net/key
parent3d6acfa7641fd0a35f608b142f61e79f7ed8db43 (diff)
downloadlinux-3.10-8ca2e93b557f2a0b35f7769038abf600177e1122.tar.gz
linux-3.10-8ca2e93b557f2a0b35f7769038abf600177e1122.tar.bz2
linux-3.10-8ca2e93b557f2a0b35f7769038abf600177e1122.zip
xfrm: SP lookups signature with mark
pass mark to all SP lookups to prepare them for when we add code to have them search. Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key')
-rw-r--r--net/key/af_key.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c
index aae3cd86ccd..36870788264 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -2326,7 +2326,7 @@ static int pfkey_spddelete(struct sock *sk, struct sk_buff *skb, struct sadb_msg
return err;
}
- xp = xfrm_policy_bysel_ctx(net, XFRM_POLICY_TYPE_MAIN,
+ xp = xfrm_policy_bysel_ctx(net, DUMMY_MARK, XFRM_POLICY_TYPE_MAIN,
pol->sadb_x_policy_dir - 1, &sel, pol_ctx,
1, &err);
security_xfrm_policy_free(pol_ctx);
@@ -2574,7 +2574,7 @@ static int pfkey_spdget(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h
return -EINVAL;
delete = (hdr->sadb_msg_type == SADB_X_SPDDELETE2);
- xp = xfrm_policy_byid(net, XFRM_POLICY_TYPE_MAIN,
+ xp = xfrm_policy_byid(net, DUMMY_MARK, XFRM_POLICY_TYPE_MAIN,
dir, pol->sadb_x_policy_id, delete, &err);
if (xp == NULL)
return -ENOENT;