projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a4a1139 4c4d41f)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <[email protected]>
Wed, 26 Jun 2013 20:23:13 +0000 (13:23 -0700)
committerDavid S. Miller <[email protected]>
Wed, 26 Jun 2013 20:23:13 +0000 (13:23 -0700)
commita77471ff7069eac4f9b408509dc4c6cb61461a56
treefb8ca76be227f2e7a4045a8939951be8c3b04250tree | snapshot
parenta4a1139b242f03dfb8a5d7a86fa674bda1cf60b2commit | diff
parent4c4d41f200db375b2d2cc6d0a1de0606c8266398commit | diff
Merge branch 'master' of git://git./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 <[email protected]>
include/uapi/linux/snmp.h diff1 | diff2 | blob | history
John Crispins staging tree