Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[powerpc.git] / net / ipv4 / xfrm4_state.c

diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c
index 9dc1afc..93e2c06 100644 (file)
--- a/net/ipv4/xfrm4_state.c
+++ b/net/ipv4/xfrm4_state.c
@@ -29,9 +29,9 @@ __xfrm4_init_tempsel(struct xfrm_state *x, struct flowi *fl,
        x->sel.daddr.a4 = fl->fl4_dst;
        x->sel.saddr.a4 = fl->fl4_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 = 32;
        x->sel.prefixlen_s = 32;
        x->sel.proto = fl->proto;
@@ -42,58 +42,16 @@ __xfrm4_init_tempsel(struct xfrm_state *x, struct flowi *fl,
        x->props.saddr = tmpl->saddr;
        if (x->props.saddr.a4 == 0)
                x->props.saddr.a4 = saddr->a4;
-       if (tmpl->mode == XFRM_MODE_TUNNEL && x->props.saddr.a4 == 0) {
-               struct rtable *rt;
-               struct flowi fl_tunnel = {
-                       .nl_u = {
-                               .ip4_u = {
-                                       .daddr = x->id.daddr.a4,
-                               }
-                       }
-               };
-               if (!xfrm_dst_lookup((struct xfrm_dst **)&rt,
-                                    &fl_tunnel, AF_INET)) {
-                       x->props.saddr.a4 = rt->rt_src;
-                       dst_release(&rt->u.dst);
-               }
-       }
        x->props.mode = tmpl->mode;
        x->props.reqid = tmpl->reqid;
        x->props.family = AF_INET;
 }
 
-static struct xfrm_state *
-__xfrm4_state_lookup(xfrm_address_t *daddr, u32 spi, u8 proto)
-{
-       unsigned h = __xfrm4_spi_hash(daddr, spi, proto);
-       struct xfrm_state *x;
-
-       list_for_each_entry(x, xfrm4_state_afinfo.state_byspi+h, byspi) {
-               if (x->props.family == AF_INET &&
-                   spi == x->id.spi &&
-                   daddr->a4 == x->id.daddr.a4 &&
-                   proto == x->id.proto) {
-                       xfrm_state_hold(x);
-                       return x;
-               }
-       }
-       return NULL;
-}
-
-/* placeholder until ipv4's code is written */
-static struct xfrm_state *
-__xfrm4_state_lookup_byaddr(xfrm_address_t *daddr, xfrm_address_t *saddr,
-                           u8 proto)
-{
-       return NULL;
-}
-
 static struct xfrm_state_afinfo xfrm4_state_afinfo = {
        .family                 = AF_INET,
        .init_flags             = xfrm4_init_flags,
        .init_tempsel           = __xfrm4_init_tempsel,
-       .state_lookup           = __xfrm4_state_lookup,
-       .state_lookup_byaddr    = __xfrm4_state_lookup_byaddr,
+       .output                 = xfrm4_output,
 };
 
 void __init xfrm4_state_init(void)