aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm/xfrm_user.c
diff options
context:
space:
mode:
authorJamal Hadi Salim <hadi@cyberus.ca>2010-02-22 06:32:57 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-22 19:21:12 -0500
commit8ca2e93b557f2a0b35f7769038abf600177e1122 (patch)
tree2b25012de07a48c33db0a191924d6e5fcc99c22a /net/xfrm/xfrm_user.c
parent3d6acfa7641fd0a35f608b142f61e79f7ed8db43 (diff)
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/xfrm/xfrm_user.c')
-rw-r--r--net/xfrm/xfrm_user.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 331ae731080a..02a67b4a64dd 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1457,7 +1457,7 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
1457 return err; 1457 return err;
1458 1458
1459 if (p->index) 1459 if (p->index)
1460 xp = xfrm_policy_byid(net, type, p->dir, p->index, delete, &err); 1460 xp = xfrm_policy_byid(net, DUMMY_MARK, type, p->dir, p->index, delete, &err);
1461 else { 1461 else {
1462 struct nlattr *rt = attrs[XFRMA_SEC_CTX]; 1462 struct nlattr *rt = attrs[XFRMA_SEC_CTX];
1463 struct xfrm_sec_ctx *ctx; 1463 struct xfrm_sec_ctx *ctx;
@@ -1474,8 +1474,8 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
1474 if (err) 1474 if (err)
1475 return err; 1475 return err;
1476 } 1476 }
1477 xp = xfrm_policy_bysel_ctx(net, type, p->dir, &p->sel, ctx, 1477 xp = xfrm_policy_bysel_ctx(net, DUMMY_MARK, type, p->dir,
1478 delete, &err); 1478 &p->sel, ctx, delete, &err);
1479 security_xfrm_policy_free(ctx); 1479 security_xfrm_policy_free(ctx);
1480 } 1480 }
1481 if (xp == NULL) 1481 if (xp == NULL)
@@ -1712,7 +1712,7 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
1712 return err; 1712 return err;
1713 1713
1714 if (p->index) 1714 if (p->index)
1715 xp = xfrm_policy_byid(net, type, p->dir, p->index, 0, &err); 1715 xp = xfrm_policy_byid(net, DUMMY_MARK, type, p->dir, p->index, 0, &err);
1716 else { 1716 else {
1717 struct nlattr *rt = attrs[XFRMA_SEC_CTX]; 1717 struct nlattr *rt = attrs[XFRMA_SEC_CTX];
1718 struct xfrm_sec_ctx *ctx; 1718 struct xfrm_sec_ctx *ctx;
@@ -1729,7 +1729,7 @@ static int xfrm_add_pol_expire(struct sk_buff *skb, struct nlmsghdr *nlh,
1729 if (err) 1729 if (err)
1730 return err; 1730 return err;
1731 } 1731 }
1732 xp = xfrm_policy_bysel_ctx(net, type, p->dir, &p->sel, ctx, 0, &err); 1732 xp = xfrm_policy_bysel_ctx(net, DUMMY_MARK, type, p->dir, &p->sel, ctx, 0, &err);
1733 security_xfrm_policy_free(ctx); 1733 security_xfrm_policy_free(ctx);
1734 } 1734 }
1735 if (xp == NULL) 1735 if (xp == NULL)