summaryrefslogtreecommitdiff
path: root/net/ipv4/ip_tunnel.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-06-26 13:23:13 -0700
committerDavid S. Miller <davem@davemloft.net>2013-06-26 13:23:13 -0700
commita77471ff7069eac4f9b408509dc4c6cb61461a56 (patch)
treefb8ca76be227f2e7a4045a8939951be8c3b04250 /net/ipv4/ip_tunnel.c
parenta4a1139b242f03dfb8a5d7a86fa674bda1cf60b2 (diff)
parent4c4d41f200db375b2d2cc6d0a1de0606c8266398 (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>
Diffstat (limited to 'net/ipv4/ip_tunnel.c')
0 files changed, 0 insertions, 0 deletions