diff options
| author | David S. Miller <davem@davemloft.net> | 2013-06-26 22:23:13 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-26 22:23:13 +0200 |
| commit | a77471ff7069eac4f9b408509dc4c6cb61461a56 (patch) | |
| tree | fb8ca76be227f2e7a4045a8939951be8c3b04250 /include/uapi | |
| parent | arc_emac: fix compile-time errors & warnings on PPC64 (diff) | |
| parent | xfrm: add LINUX_MIB_XFRMACQUIREERROR statistic counter (diff) | |
| download | linux-a77471ff7069eac4f9b408509dc4c6cb61461a56.tar.xz linux-a77471ff7069eac4f9b408509dc4c6cb61461a56.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
Just one patch this time.
1) Drop packets when the matching SA is in larval state and add a
statistic counter for that. From Fan Du.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
| -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 26cbf76f8058..af0a674cc677 100644 --- a/include/uapi/linux/snmp.h +++ b/include/uapi/linux/snmp.h @@ -288,6 +288,7 @@ enum LINUX_MIB_XFRMOUTPOLERROR, /* XfrmOutPolError */ LINUX_MIB_XFRMFWDHDRERROR, /* XfrmFwdHdrError*/ LINUX_MIB_XFRMOUTSTATEINVALID, /* XfrmOutStateInvalid */ + LINUX_MIB_XFRMACQUIREERROR, /* XfrmAcquireError */ __LINUX_MIB_XFRMMAX }; |