git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'HEAD' of master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
[pandora-kernel.git]
/
include
/
linux
/
pfkeyv2.h
diff --git
a/include/linux/pfkeyv2.h
b/include/linux/pfkeyv2.h
index
52ed4a5
..
d9db5f6
100644
(file)
--- a/
include/linux/pfkeyv2.h
+++ b/
include/linux/pfkeyv2.h
@@
-251,7
+251,8
@@
struct sadb_x_sec_ctx {
#define SADB_X_SPDEXPIRE 21
#define SADB_X_SPDDELETE2 22
#define SADB_X_NAT_T_NEW_MAPPING 23
-#define SADB_MAX 23
+#define SADB_X_MIGRATE 24
+#define SADB_MAX 24
/* Security Association flags */
#define SADB_SAFLAGS_PFS 1