diff options
| author | Jamal Hadi Salim <hadi@cyberus.ca> | 2010-02-22 16:20:22 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-22 16:20:22 -0800 |
| commit | bd55775c8dd656fc69b3a42a1c4ab32abb7e8af9 (patch) | |
| tree | 766b30d5fc29d5d4849a10a290db51fe0f7c3ad7 /net/ipv4/ipcomp.c | |
| parent | bf825f81b454fae2ffe1b675f3a549656726440e (diff) | |
| download | linux-stable-bd55775c8dd656fc69b3a42a1c4ab32abb7e8af9.tar.gz linux-stable-bd55775c8dd656fc69b3a42a1c4ab32abb7e8af9.tar.bz2 linux-stable-bd55775c8dd656fc69b3a42a1c4ab32abb7e8af9.zip | |
xfrm: SA lookups signature with mark
pass mark to all SA 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/ipv4/ipcomp.c')
| -rw-r--r-- | net/ipv4/ipcomp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c index 83ed71500898..629067571f02 100644 --- a/net/ipv4/ipcomp.c +++ b/net/ipv4/ipcomp.c @@ -36,7 +36,7 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info) return; spi = htonl(ntohs(ipch->cpi)); - x = xfrm_state_lookup(net, (xfrm_address_t *)&iph->daddr, + x = xfrm_state_lookup(net, skb->mark, (xfrm_address_t *)&iph->daddr, spi, IPPROTO_COMP, AF_INET); if (!x) return; @@ -63,6 +63,7 @@ static struct xfrm_state *ipcomp_tunnel_create(struct xfrm_state *x) t->props.mode = x->props.mode; t->props.saddr.a4 = x->props.saddr.a4; t->props.flags = x->props.flags; + memcpy(&t->mark, &x->mark, sizeof(t->mark)); if (xfrm_init_state(t)) goto error; @@ -87,8 +88,9 @@ static int ipcomp_tunnel_attach(struct xfrm_state *x) struct net *net = xs_net(x); int err = 0; struct xfrm_state *t; + u32 mark = x->mark.v & x->mark.m; - t = xfrm_state_lookup(net, (xfrm_address_t *)&x->id.daddr.a4, + t = xfrm_state_lookup(net, mark, (xfrm_address_t *)&x->id.daddr.a4, x->props.saddr.a4, IPPROTO_IPIP, AF_INET); if (!t) { t = ipcomp_tunnel_create(x); |