diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-01-23 14:00:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-23 14:00:16 -0500 |
| commit | 93b9c1ddd3fb4a5b67d512e534b30070f9ecec28 (patch) | |
| tree | f9584c9b3ff6873b2be043ea08c0fbb354c040df /include/uapi/linux | |
| parent | bnx2x: SR-IOV version compatibility bugfix (diff) | |
| parent | xfrm: Remove unused defines (diff) | |
| download | linux-dev-93b9c1ddd3fb4a5b67d512e534b30070f9ecec28.tar.xz linux-dev-93b9c1ddd3fb4a5b67d512e534b30070f9ecec28.zip | |
Merge branch 'testing' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
1) Add a statistic counter for invalid output states and
remove a superfluous state valid check, from Li RongQing.
2) Probe for asynchronous block ciphers instead of synchronous block
ciphers to make the asynchronous variants available even if no
synchronous block ciphers are found, from Jussi Kivilinna.
3) Make rfc3686 asynchronous block cipher and make use of
the new asynchronous variant, from Jussi Kivilinna.
4) Replace some rwlocks by rcu, from Cong Wang.
5) Remove some unused defines.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/snmp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h index fdfba235f9f1..b49eab89c9fd 100644 --- a/include/uapi/linux/snmp.h +++ b/include/uapi/linux/snmp.h @@ -278,6 +278,7 @@ enum LINUX_MIB_XFRMOUTPOLDEAD, /* XfrmOutPolDead */ LINUX_MIB_XFRMOUTPOLERROR, /* XfrmOutPolError */ LINUX_MIB_XFRMFWDHDRERROR, /* XfrmFwdHdrError*/ + LINUX_MIB_XFRMOUTSTATEINVALID, /* XfrmOutStateInvalid */ __LINUX_MIB_XFRMMAX }; |