diff --git a/[refs] b/[refs]
index 076f0bde75ac..7f33113a6720 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fdf475aa141a669af8db6ccc7015f0b725087de
+refs/heads/master: 138f3c8518976953563a1316d7e0420c72d4ab96
diff --git a/trunk/net/xfrm/xfrm_algo.c b/trunk/net/xfrm/xfrm_algo.c
index faf54c6bf96b..348196df81ef 100644
--- a/trunk/net/xfrm/xfrm_algo.c
+++ b/trunk/net/xfrm/xfrm_algo.c
@@ -365,6 +365,7 @@ static struct xfrm_algo_desc ealg_list[] = {
 },
 {
 	.name = "cbc(camellia)",
+	.compat = "camellia",
 
 	.uinfo = {
 		.encr = {