[IPV6]: Add ip6_local_out

Most callers of the LOCAL_OUT chain will set the IP packet length
before doing so.  They also share the same output function dst_output.

This patch creates a new function called ip6_local_out which does all
of that and converts the appropriate users over to it.

Apart from removing duplicate code, it will also help in merging the
IPsec output path.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 3 deletions

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index a4051afaf776..29b5321e39c3 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -910,15 +910,13 @@ static int ip6_tnl_xmit2(struct sk_buff *skb,
         *(__be32*)ipv6h = fl->fl6_flowlabel | htonl(0x60000000);
         dsfield = INET_ECN_encapsulate(0, dsfield);
         ipv6_change_dsfield(ipv6h, ~INET_ECN_MASK, dsfield);
-        ipv6h->payload_len = htons(skb->len - sizeof(struct ipv6hdr));
         ipv6h->hop_limit = t->parms.hop_limit;
         ipv6h->nexthdr = proto;
         ipv6_addr_copy(&ipv6h->saddr, &fl->fl6_src);
         ipv6_addr_copy(&ipv6h->daddr, &fl->fl6_dst);
         nf_reset(skb);
         pkt_len = skb->len;
-        err = NF_HOOK(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL,
-                      skb->dst->dev, dst_output);
+        err = ip6_local_out(skb);
 
         if (net_xmit_eval(err) == 0) {
                 stats->tx_bytes += pkt_len;