]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b568114 39e5fb8)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Wed, 26 Jun 2013 20:23:13 +0000 (13:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 26 Jun 2013 20:23:13 +0000 (13:23 -0700)
commitbbc94df53dc9ff1502f949015e8c4d6214b2f294
treefb8ca76be227f2e7a4045a8939951be8c3b04250tree | snapshot
parentb568114dca42bd7473fcb2e356d54e380e089a93commit | diff
parent39e5fb8fa9171b26887a448a9abb33e534ed1983commit | diff
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>
include/uapi/linux/snmp.h diff1 | diff2 | blob | history
Linux Kernel Source Tree.