Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[mirror_ubuntu-artful-kernel.git] / net / xfrm / xfrm_algo.c

diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index 42f7c76cf853697341a6e34cf522f92927b36ad4..f07224d8b88f6a2479de02ce944181edcd2576ab 100644 (file)
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -31,7 +31,7 @@ static struct xfrm_algo_desc aead_list[] = {
 
        .uinfo = {
                .aead = {
-                       .geniv = "seqniv",
+                       .geniv = "seqiv",
                        .icv_truncbits = 64,
                }
        },
@@ -50,7 +50,7 @@ static struct xfrm_algo_desc aead_list[] = {
 
        .uinfo = {
                .aead = {
-                       .geniv = "seqniv",
+                       .geniv = "seqiv",
                        .icv_truncbits = 96,
                }
        },
@@ -69,7 +69,7 @@ static struct xfrm_algo_desc aead_list[] = {
 
        .uinfo = {
                .aead = {
-                       .geniv = "seqniv",
+                       .geniv = "seqiv",
                        .icv_truncbits = 128,
                }
        },
@@ -88,7 +88,7 @@ static struct xfrm_algo_desc aead_list[] = {
 
        .uinfo = {
                .aead = {
-                       .geniv = "seqniv",
+                       .geniv = "seqiv",
                        .icv_truncbits = 64,
                }
        },
@@ -107,7 +107,7 @@ static struct xfrm_algo_desc aead_list[] = {
 
        .uinfo = {
                .aead = {
-                       .geniv = "seqniv",
+                       .geniv = "seqiv",
                        .icv_truncbits = 96,
                }
        },
@@ -126,7 +126,7 @@ static struct xfrm_algo_desc aead_list[] = {
 
        .uinfo = {
                .aead = {
-                       .geniv = "seqniv",
+                       .geniv = "seqiv",
                        .icv_truncbits = 128,
                }
        },
@@ -164,7 +164,7 @@ static struct xfrm_algo_desc aead_list[] = {
 
        .uinfo = {
                .aead = {
-                       .geniv = "seqniv",
+                       .geniv = "seqiv",
                        .icv_truncbits = 128,
                }
        },