git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
net
/
xfrm
/
xfrm_algo.c
diff --git
a/net/xfrm/xfrm_algo.c
b/net/xfrm/xfrm_algo.c
index
ef8d61d
..
743c013
100644
(file)
--- a/
net/xfrm/xfrm_algo.c
+++ b/
net/xfrm/xfrm_algo.c
@@
-399,6
+399,7
@@
static struct xfrm_algo_desc ealg_list[] = {
},
{
.name = "cbc(camellia)",
+ .compat = "camellia",
.uinfo = {
.encr = {