Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-drm-fsl-dcu.git] / net / ipv6 / xfrm6_state.c

diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c
index 40fcaab7e028858f65ca83e67c917d0b22d5fe14..baa461b9f74eebf97c654aa858203dcf010aa7e8 100644 (file)
--- a/net/ipv6/xfrm6_state.c
+++ b/net/ipv6/xfrm6_state.c
@@ -8,7 +8,7 @@
  *             IPv6 support
  *     YOSHIFUJI Hideaki @USAGI
  *             Split up af-specific portion
- *     
+ *
  */
 
 #include <net/xfrm.h>
@@ -29,9 +29,9 @@ __xfrm6_init_tempsel(struct xfrm_state *x, struct flowi *fl,
        ipv6_addr_copy((struct in6_addr *)&x->sel.daddr, &fl->fl6_dst);
        ipv6_addr_copy((struct in6_addr *)&x->sel.saddr, &fl->fl6_src);
        x->sel.dport = xfrm_flowi_dport(fl);
-       x->sel.dport_mask = ~0;
+       x->sel.dport_mask = htons(0xffff);
        x->sel.sport = xfrm_flowi_sport(fl);
-       x->sel.sport_mask = ~0;
+       x->sel.sport_mask = htons(0xffff);
        x->sel.prefixlen_d = 128;
        x->sel.prefixlen_s = 128;
        x->sel.proto = fl->proto;
@@ -42,65 +42,11 @@ __xfrm6_init_tempsel(struct xfrm_state *x, struct flowi *fl,
        memcpy(&x->props.saddr, &tmpl->saddr, sizeof(x->props.saddr));
        if (ipv6_addr_any((struct in6_addr*)&x->props.saddr))
                memcpy(&x->props.saddr, saddr, sizeof(x->props.saddr));
-       if (tmpl->mode == XFRM_MODE_TUNNEL && ipv6_addr_any((struct in6_addr*)&x->props.saddr)) {
-               struct rt6_info *rt;
-               struct flowi fl_tunnel = {
-                       .nl_u = {
-                               .ip6_u = {
-                                       .daddr = *(struct in6_addr *)daddr,
-                               }
-                       }
-               };
-               if (!xfrm_dst_lookup((struct xfrm_dst **)&rt,
-                                    &fl_tunnel, AF_INET6)) {
-                       ipv6_get_saddr(&rt->u.dst, (struct in6_addr *)daddr,
-                                      (struct in6_addr *)&x->props.saddr);
-                       dst_release(&rt->u.dst);
-               }
-       }
        x->props.mode = tmpl->mode;
        x->props.reqid = tmpl->reqid;
        x->props.family = AF_INET6;
 }
 
-static struct xfrm_state *
-__xfrm6_state_lookup_byaddr(xfrm_address_t *daddr, xfrm_address_t *saddr,
-                           u8 proto)
-{
-       struct xfrm_state *x = NULL;
-       unsigned h;
-
-       h = __xfrm6_src_hash(saddr);
-       list_for_each_entry(x, xfrm6_state_afinfo.state_bysrc+h, bysrc) {
-               if (x->props.family == AF_INET6 &&
-                   ipv6_addr_equal((struct in6_addr *)daddr, (struct in6_addr *)x->id.daddr.a6) &&
-                   ipv6_addr_equal((struct in6_addr *)saddr, (struct in6_addr *)x->props.saddr.a6) &&
-                   proto == x->id.proto) {
-                       xfrm_state_hold(x);
-                       return x;
-               }
-       }
-       return NULL;
-}
-
-static struct xfrm_state *
-__xfrm6_state_lookup(xfrm_address_t *daddr, u32 spi, u8 proto)
-{
-       unsigned h = __xfrm6_spi_hash(daddr, spi, proto);
-       struct xfrm_state *x;
-
-       list_for_each_entry(x, xfrm6_state_afinfo.state_byspi+h, byspi) {
-               if (x->props.family == AF_INET6 &&
-                   spi == x->id.spi &&
-                   ipv6_addr_equal((struct in6_addr *)daddr, (struct in6_addr *)x->id.daddr.a6) &&
-                   proto == x->id.proto) {
-                       xfrm_state_hold(x);
-                       return x;
-               }
-       }
-       return NULL;
-}
-
 static int
 __xfrm6_state_sort(struct xfrm_state **dst, struct xfrm_state **src, int n)
 {
@@ -223,10 +169,9 @@ __xfrm6_tmpl_sort(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n)
 static struct xfrm_state_afinfo xfrm6_state_afinfo = {
        .family                 = AF_INET6,
        .init_tempsel           = __xfrm6_init_tempsel,
-       .state_lookup           = __xfrm6_state_lookup,
-       .state_lookup_byaddr    = __xfrm6_state_lookup_byaddr,
        .tmpl_sort              = __xfrm6_tmpl_sort,
        .state_sort             = __xfrm6_state_sort,
+       .output                 = xfrm6_output,
 };
 
 void __init xfrm6_state_init(void)