Merge branch 'eseries' into pxa

[linux-2.6] / net / xfrm / xfrm_algo.c

diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c
index 8aa6440d689f75bde521070c5d3f81ce5c81199b..23a2cc04b8cdb5f4a9f215643bfc1df130800322 100644 (file)
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@@ -129,8 +129,7 @@ static struct xfrm_algo_desc aead_list[] = {
 
 static struct xfrm_algo_desc aalg_list[] = {
 {
-       .name = "hmac(digest_null)",
-       .compat = "digest_null",
+       .name = "digest_null",
 
        .uinfo = {
                .auth = {
@@ -201,8 +200,8 @@ static struct xfrm_algo_desc aalg_list[] = {
        }
 },
 {
-       .name = "hmac(ripemd160)",
-       .compat = "ripemd160",
+       .name = "hmac(rmd160)",
+       .compat = "rmd160",
 
        .uinfo = {
                .auth = {