xfrm: remove output2 indirection from xfrm_mode

similar to previous patch: no external module dependencies,
so we can avoid the indirection by placing this in the core.

This change removes the last indirection from xfrm_mode and the
xfrm4|6_mode_{beet,tunnel}.c modules contain (almost) no code anymore.

Before:
   text    data     bss     dec     hex filename
   3957     136       0    4093     ffd net/xfrm/xfrm_output.o
    587      44       0     631     277 net/ipv4/xfrm4_mode_beet.o
    649      32       0     681     2a9 net/ipv4/xfrm4_mode_tunnel.o
    625      44       0     669     29d net/ipv6/xfrm6_mode_beet.o
    599      32       0     631     277 net/ipv6/xfrm6_mode_tunnel.o
After:
   text    data     bss     dec     hex filename
   5359     184       0    5543    15a7 net/xfrm/xfrm_output.o
    171      24       0     195      c3 net/ipv4/xfrm4_mode_beet.o
    171      24       0     195      c3 net/ipv4/xfrm4_mode_tunnel.o
    172      24       0     196      c4 net/ipv6/xfrm6_mode_beet.o
    172      24       0     196      c4 net/ipv6/xfrm6_mode_tunnel.o

v2: fold the *encap_add functions into xfrm*_prepare_output
    preserve (move) output2 comment (Sabrina)
    use x->outer_mode->encap, not inner
    fix a build breakage on ppc (kbuild robot)

Signed-off-by: Florian Westphal <fw@strlen.de>
Reviewed-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

2 files changed, 0 insertions, 94 deletions

diff --git a/net/ipv6/xfrm6_mode_beet.c b/net/ipv6/xfrm6_mode_beet.c
index a0537b4f62f8..1c4a76bdd889 100644
--- a/net/ipv6/xfrm6_mode_beet.c
+++ b/net/ipv6/xfrm6_mode_beet.c
@@ -19,65 +19,7 @@
 #include <net/ipv6.h>
 #include <net/xfrm.h>
 
-static void xfrm6_beet_make_header(struct sk_buff *skb)
-{
-        struct ipv6hdr *iph = ipv6_hdr(skb);
-
-        iph->version = 6;
-
-        memcpy(iph->flow_lbl, XFRM_MODE_SKB_CB(skb)->flow_lbl,
-               sizeof(iph->flow_lbl));
-        iph->nexthdr = XFRM_MODE_SKB_CB(skb)->protocol;
-
-        ipv6_change_dsfield(iph, 0, XFRM_MODE_SKB_CB(skb)->tos);
-        iph->hop_limit = XFRM_MODE_SKB_CB(skb)->ttl;
-}
-
-/* Add encapsulation header.
- *
- * The top IP header will be constructed per draft-nikander-esp-beet-mode-06.txt.
- */
-static int xfrm6_beet_output(struct xfrm_state *x, struct sk_buff *skb)
-{
-        struct ipv6hdr *top_iph;
-        struct ip_beet_phdr *ph;
-        int optlen, hdr_len;
-
-        hdr_len = 0;
-        optlen = XFRM_MODE_SKB_CB(skb)->optlen;
-        if (unlikely(optlen))
-                hdr_len += IPV4_BEET_PHMAXLEN - (optlen & 4);
-
-        skb_set_network_header(skb, -x->props.header_len - hdr_len);
-        if (x->sel.family != AF_INET6)
-                skb->network_header += IPV4_BEET_PHMAXLEN;
-        skb->mac_header = skb->network_header +
-                          offsetof(struct ipv6hdr, nexthdr);
-        skb->transport_header = skb->network_header + sizeof(*top_iph);
-        ph = __skb_pull(skb, XFRM_MODE_SKB_CB(skb)->ihl - hdr_len);
-
-        xfrm6_beet_make_header(skb);
-
-        top_iph = ipv6_hdr(skb);
-        if (unlikely(optlen)) {
-
-                BUG_ON(optlen < 0);
-
-                ph->padlen = 4 - (optlen & 4);
-                ph->hdrlen = optlen / 8;
-                ph->nexthdr = top_iph->nexthdr;
-                if (ph->padlen)
-                        memset(ph + 1, IPOPT_NOP, ph->padlen);
-
-                top_iph->nexthdr = IPPROTO_BEETPH;
-        }
-
-        top_iph->saddr = *(struct in6_addr *)&x->props.saddr;
-        top_iph->daddr = *(struct in6_addr *)&x->id.daddr;
-        return 0;
-}
 static struct xfrm_mode xfrm6_beet_mode = {
-        .output2 = xfrm6_beet_output,
         .owner = THIS_MODULE,
         .encap = XFRM_MODE_BEET,
         .flags = XFRM_MODE_FLAG_TUNNEL,
diff --git a/net/ipv6/xfrm6_mode_tunnel.c b/net/ipv6/xfrm6_mode_tunnel.c
index 79c57decb472..e5c928dd70e3 100644
--- a/net/ipv6/xfrm6_mode_tunnel.c
+++ b/net/ipv6/xfrm6_mode_tunnel.c
@@ -22,43 +22,7 @@
  *
  * The top IP header will be constructed per RFC 2401.
  */
-static int xfrm6_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
-{
-        struct dst_entry *dst = skb_dst(skb);
-        struct ipv6hdr *top_iph;
-        int dsfield;
-
-        skb_set_inner_network_header(skb, skb_network_offset(skb));
-        skb_set_inner_transport_header(skb, skb_transport_offset(skb));
-
-        skb_set_network_header(skb, -x->props.header_len);
-        skb->mac_header = skb->network_header +
-                          offsetof(struct ipv6hdr, nexthdr);
-        skb->transport_header = skb->network_header + sizeof(*top_iph);
-        top_iph = ipv6_hdr(skb);
-
-        top_iph->version = 6;
-
-        memcpy(top_iph->flow_lbl, XFRM_MODE_SKB_CB(skb)->flow_lbl,
-               sizeof(top_iph->flow_lbl));
-        top_iph->nexthdr = xfrm_af2proto(skb_dst(skb)->ops->family);
-
-        if (x->props.extra_flags & XFRM_SA_XFLAG_DONT_ENCAP_DSCP)
-                dsfield = 0;
-        else
-                dsfield = XFRM_MODE_SKB_CB(skb)->tos;
-        dsfield = INET_ECN_encapsulate(dsfield, XFRM_MODE_SKB_CB(skb)->tos);
-        if (x->props.flags & XFRM_STATE_NOECN)
-                dsfield &= ~INET_ECN_MASK;
-        ipv6_change_dsfield(top_iph, 0, dsfield);
-        top_iph->hop_limit = ip6_dst_hoplimit(xfrm_dst_child(dst));
-        top_iph->saddr = *(struct in6_addr *)&x->props.saddr;
-        top_iph->daddr = *(struct in6_addr *)&x->id.daddr;
-        return 0;
-}
-
 static struct xfrm_mode xfrm6_tunnel_mode = {
-        .output2 = xfrm6_mode_tunnel_output,
         .owner = THIS_MODULE,
         .encap = XFRM_MODE_TUNNEL,
         .flags = XFRM_MODE_FLAG_TUNNEL,