ESP: Export esp_output_fill_trailer function

The esp fill trailer method is identical for both
IPv6 and IPv4.

Share the implementation for esp6 and esp to avoid
code duplication in addition it could be also used
at various drivers code.

Signed-off-by: Raed Salem <raeds@mellanox.com>
Reviewed-by: Boris Pismenny <borisp@mellanox.com>
Reviewed-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

diff --git a/include/net/esp.h b/include/net/esp.h
index 117652eb6ea32a836cd269f01e70f0e3c990fbc7..9c5637d41d95168052686caf7b3ff51b517e6b9b 100644 (file)
--- a/include/net/esp.h
+++ b/include/net/esp.h
@@ -11,6 +11,22 @@ static inline struct ip_esp_hdr *ip_esp_hdr(const struct sk_buff *skb)
        return (struct ip_esp_hdr *)skb_transport_header(skb);
 }
 
+static inline void esp_output_fill_trailer(u8 *tail, int tfclen, int plen, __u8 proto)
+{
+       /* Fill padding... */
+       if (tfclen) {
+               memset(tail, 0, tfclen);
+               tail += tfclen;
+       }
+       do {
+               int i;
+               for (i = 0; i < plen - 2; i++)
+                       tail[i] = i + 1;
+       } while (0);
+       tail[plen - 2] = plen - 2;
+       tail[plen - 1] = proto;
+}
+
 struct esp_info {
        struct  ip_esp_hdr *esph;
        __be64  seqno;

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 103c7d599a3c907ed55d9eac8cbb288a2aaecae0..8b07f3a4f2db2509bed581ab549c09b621c8b7ea 100644 (file)
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -341,22 +341,6 @@ static void esp_output_done_esn(struct crypto_async_request *base, int err)
        esp_output_done(base, err);
 }
 
-static void esp_output_fill_trailer(u8 *tail, int tfclen, int plen, __u8 proto)
-{
-       /* Fill padding... */
-       if (tfclen) {
-               memset(tail, 0, tfclen);
-               tail += tfclen;
-       }
-       do {
-               int i;
-               for (i = 0; i < plen - 2; i++)
-                       tail[i] = i + 1;
-       } while (0);
-       tail[plen - 2] = plen - 2;
-       tail[plen - 1] = proto;
-}
-
 static struct ip_esp_hdr *esp_output_udp_encap(struct sk_buff *skb,
                                               int encap_type,
                                               struct esp_info *esp,

diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index a3b403ba8f8f00124a4eac73e6dab0ad65ea0f64..11143d039f16d0e29124a63f58638756508dbc8d 100644 (file)
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -207,22 +207,6 @@ static void esp_output_done_esn(struct crypto_async_request *base, int err)
        esp_output_done(base, err);
 }
 
-static void esp_output_fill_trailer(u8 *tail, int tfclen, int plen, __u8 proto)
-{
-       /* Fill padding... */
-       if (tfclen) {
-               memset(tail, 0, tfclen);
-               tail += tfclen;
-       }
-       do {
-               int i;
-               for (i = 0; i < plen - 2; i++)
-                       tail[i] = i + 1;
-       } while (0);
-       tail[plen - 2] = plen - 2;
-       tail[plen - 1] = proto;
-}
-
 int esp6_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info *esp)
 {
        u8 *tail;