ARM: OMAP2: Place SMS and SDRC into smart idle mode

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

diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c
index 6a2a4ab42772a00bd2978b93dd2de07fac3976b9..93e2c061cddaf3b71a7c6e3c0bae0a22f1b45d76 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,21 +42,6 @@ __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;
@@ -66,6 +51,7 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = {
        .family                 = AF_INET,
        .init_flags             = xfrm4_init_flags,
        .init_tempsel           = __xfrm4_init_tempsel,
+       .output                 = xfrm4_output,
 };
 
 void __init xfrm4_state_init(void)