[NET_SCHED]: HTB: fix incorrect use of RB_EMPTY_NODE

[linux-2.6-omap-h63xx.git] / net / ipv4 / xfrm4_policy.c

diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index 42d8ded0f96a81116dd624dd337901bb18b8f0a8..eabcd27b176730d83e42ce599e28c7a7e3407e0f 100644 (file)
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -21,6 +21,25 @@ static int xfrm4_dst_lookup(struct xfrm_dst **dst, struct flowi *fl)
        return __ip_route_output_key((struct rtable**)dst, fl);
 }
 
+static int xfrm4_get_saddr(xfrm_address_t *saddr, xfrm_address_t *daddr)
+{
+       struct rtable *rt;
+       struct flowi fl_tunnel = {
+               .nl_u = {
+                       .ip4_u = {
+                               .daddr = daddr->a4,
+                       },
+               },
+       };
+
+       if (!xfrm4_dst_lookup((struct xfrm_dst **)&rt, &fl_tunnel)) {
+               saddr->a4 = rt->rt_src;
+               dst_release(&rt->u.dst);
+               return 0;
+       }
+       return -EHOSTUNREACH;
+}
+
 static struct dst_entry *
 __xfrm4_find_bundle(struct flowi *fl, struct xfrm_policy *policy)
 {
@@ -93,6 +112,7 @@ __xfrm4_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int
 
                xdst = (struct xfrm_dst *)dst1;
                xdst->route = &rt->u.dst;
+               xdst->genid = xfrm[i]->genid;
 
                dst1->next = dst_prev;
                dst_prev = dst1;
@@ -297,6 +317,7 @@ static struct xfrm_policy_afinfo xfrm4_policy_afinfo = {
        .family =               AF_INET,
        .dst_ops =              &xfrm4_dst_ops,
        .dst_lookup =           xfrm4_dst_lookup,
+       .get_saddr =            xfrm4_get_saddr,
        .find_bundle =          __xfrm4_find_bundle,
        .bundle_create =        __xfrm4_bundle_create,
        .decode_session =       _decode_session4,