1 files changed, 16 insertions, 0 deletions

diff --git a/net/ipv4/ipvs/ip_vs_ftp.c b/net/ipv4/ipvs/ip_vs_ftp.c
index 0c3fbe0de5f..2e7dbd8b73a 100644
--- a/net/ipv4/ipvs/ip_vs_ftp.c
+++ b/net/ipv4/ipvs/ip_vs_ftp.c
@@ -147,6 +147,14 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,
         unsigned buf_len;
         int ret;
 
+#ifdef CONFIG_IP_VS_IPV6
+        /* This application helper doesn't work with IPv6 yet,
+         * so turn this into a no-op for IPv6 packets
+         */
+        if (cp->af == AF_INET6)
+                return 1;
+#endif
+
         *diff = 0;
 
         /* Only useful for established sessions */
@@ -248,6 +256,14 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp,
         __be16 port;
         struct ip_vs_conn *n_cp;
 
+#ifdef CONFIG_IP_VS_IPV6
+        /* This application helper doesn't work with IPv6 yet,
+         * so turn this into a no-op for IPv6 packets
+         */
+        if (cp->af == AF_INET6)
+                return 1;
+#endif
+
         /* no diff required for incoming packets */
         *diff = 0;