xfrm: remove init_tempsel indirection from xfrm_state_afinfo

Simple initialization, handle it in the caller.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index a290787..ba65434 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -354,8 +354,6 @@ struct xfrm_state_afinfo {
        const struct xfrm_type_offload  *type_offload_map[IPPROTO_MAX];
 
        int                     (*init_flags)(struct xfrm_state *x);
-       void                    (*init_tempsel)(struct xfrm_selector *sel,
-                                               const struct flowi *fl);
        void                    (*init_temprop)(struct xfrm_state *x,
                                                const struct xfrm_tmpl *tmpl,
                                                const xfrm_address_t *daddr,

diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c
index 80c40b4..da0fd95 100644 (file)
--- a/net/ipv4/xfrm4_state.c
+++ b/net/ipv4/xfrm4_state.c
@@ -23,24 +23,6 @@ static int xfrm4_init_flags(struct xfrm_state *x)
 }
 
 static void
-__xfrm4_init_tempsel(struct xfrm_selector *sel, const struct flowi *fl)
-{
-       const struct flowi4 *fl4 = &fl->u.ip4;
-
-       sel->daddr.a4 = fl4->daddr;
-       sel->saddr.a4 = fl4->saddr;
-       sel->dport = xfrm_flowi_dport(fl, &fl4->uli);
-       sel->dport_mask = htons(0xffff);
-       sel->sport = xfrm_flowi_sport(fl, &fl4->uli);
-       sel->sport_mask = htons(0xffff);
-       sel->family = AF_INET;
-       sel->prefixlen_d = 32;
-       sel->prefixlen_s = 32;
-       sel->proto = fl4->flowi4_proto;
-       sel->ifindex = fl4->flowi4_oif;
-}
-
-static void
 xfrm4_init_temprop(struct xfrm_state *x, const struct xfrm_tmpl *tmpl,
                   const xfrm_address_t *daddr, const xfrm_address_t *saddr)
 {
@@ -77,7 +59,6 @@ static struct xfrm_state_afinfo xfrm4_state_afinfo = {
        .eth_proto              = htons(ETH_P_IP),
        .owner                  = THIS_MODULE,
        .init_flags             = xfrm4_init_flags,
-       .init_tempsel           = __xfrm4_init_tempsel,
        .init_temprop           = xfrm4_init_temprop,
        .output                 = xfrm4_output,
        .output_finish          = xfrm4_output_finish,

diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c
index 5bdca3d..0e19ded 100644 (file)
--- a/net/ipv6/xfrm6_state.c
+++ b/net/ipv6/xfrm6_state.c
@@ -22,26 +22,6 @@
 #include <net/addrconf.h>
 
 static void
-__xfrm6_init_tempsel(struct xfrm_selector *sel, const struct flowi *fl)
-{
-       const struct flowi6 *fl6 = &fl->u.ip6;
-
-       /* Initialize temporary selector matching only
-        * to current session. */
-       *(struct in6_addr *)&sel->daddr = fl6->daddr;
-       *(struct in6_addr *)&sel->saddr = fl6->saddr;
-       sel->dport = xfrm_flowi_dport(fl, &fl6->uli);
-       sel->dport_mask = htons(0xffff);
-       sel->sport = xfrm_flowi_sport(fl, &fl6->uli);
-       sel->sport_mask = htons(0xffff);
-       sel->family = AF_INET6;
-       sel->prefixlen_d = 128;
-       sel->prefixlen_s = 128;
-       sel->proto = fl6->flowi6_proto;
-       sel->ifindex = fl6->flowi6_oif;
-}
-
-static void
 xfrm6_init_temprop(struct xfrm_state *x, const struct xfrm_tmpl *tmpl,
                   const xfrm_address_t *daddr, const xfrm_address_t *saddr)
 {
@@ -173,7 +153,6 @@ static struct xfrm_state_afinfo xfrm6_state_afinfo = {
        .proto                  = IPPROTO_IPV6,
        .eth_proto              = htons(ETH_P_IPV6),
        .owner                  = THIS_MODULE,
-       .init_tempsel           = __xfrm6_init_tempsel,
        .init_temprop           = xfrm6_init_temprop,
        .tmpl_sort              = __xfrm6_tmpl_sort,
        .state_sort             = __xfrm6_state_sort,

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 50621d9..66d9009 100644 (file)
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -770,6 +770,43 @@ void xfrm_sad_getinfo(struct net *net, struct xfrmk_sadinfo *si)
 EXPORT_SYMBOL(xfrm_sad_getinfo);
 
 static void
+__xfrm4_init_tempsel(struct xfrm_selector *sel, const struct flowi *fl)
+{
+       const struct flowi4 *fl4 = &fl->u.ip4;
+
+       sel->daddr.a4 = fl4->daddr;
+       sel->saddr.a4 = fl4->saddr;
+       sel->dport = xfrm_flowi_dport(fl, &fl4->uli);
+       sel->dport_mask = htons(0xffff);
+       sel->sport = xfrm_flowi_sport(fl, &fl4->uli);
+       sel->sport_mask = htons(0xffff);
+       sel->family = AF_INET;
+       sel->prefixlen_d = 32;
+       sel->prefixlen_s = 32;
+       sel->proto = fl4->flowi4_proto;
+       sel->ifindex = fl4->flowi4_oif;
+}
+
+static void
+__xfrm6_init_tempsel(struct xfrm_selector *sel, const struct flowi *fl)
+{
+       const struct flowi6 *fl6 = &fl->u.ip6;
+
+       /* Initialize temporary selector matching only to current session. */
+       *(struct in6_addr *)&sel->daddr = fl6->daddr;
+       *(struct in6_addr *)&sel->saddr = fl6->saddr;
+       sel->dport = xfrm_flowi_dport(fl, &fl6->uli);
+       sel->dport_mask = htons(0xffff);
+       sel->sport = xfrm_flowi_sport(fl, &fl6->uli);
+       sel->sport_mask = htons(0xffff);
+       sel->family = AF_INET6;
+       sel->prefixlen_d = 128;
+       sel->prefixlen_s = 128;
+       sel->proto = fl6->flowi6_proto;
+       sel->ifindex = fl6->flowi6_oif;
+}
+
+static void
 xfrm_init_tempstate(struct xfrm_state *x, const struct flowi *fl,
                    const struct xfrm_tmpl *tmpl,
                    const xfrm_address_t *daddr, const xfrm_address_t *saddr,
@@ -777,16 +814,21 @@ xfrm_init_tempstate(struct xfrm_state *x, const struct flowi *fl,
 {
        struct xfrm_state_afinfo *afinfo = xfrm_state_afinfo_get_rcu(family);
 
+       switch (family) {
+       case AF_INET:
+               __xfrm4_init_tempsel(&x->sel, fl);
+               break;
+       case AF_INET6:
+               __xfrm6_init_tempsel(&x->sel, fl);
+               break;
+       }
+
+       if (family != tmpl->encap_family)
+               afinfo = xfrm_state_afinfo_get_rcu(tmpl->encap_family);
+
        if (!afinfo)
                return;
 
-       afinfo->init_tempsel(&x->sel, fl);
-
-       if (family != tmpl->encap_family) {
-               afinfo = xfrm_state_afinfo_get_rcu(tmpl->encap_family);
-               if (!afinfo)
-                       return;
-       }
        afinfo->init_temprop(x, tmpl, daddr, saddr);
 }