tree 9715bb206a1dee466c854ce86e164aadef105aba
parent 5f8e44741f9f216e33736ea4ec65ca9ac03036e6
parent d6af1a31cc72fbd558c7eddbc36f61bf09d1cf6a
author David S. Miller <davem@davemloft.net> 1462394131 -0400
committer David S. Miller <davem@davemloft.net> 1462394131 -0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

Steffen Klassert says:

====================
pull request (net): ipsec 2016-05-04

1) The flowcache can hit an OOM condition if too
   many entries are in the gc_list. Fix this by
   counting the entries in the gc_list and refuse
   new allocations if the value is too high.

2) The inner headers are invalid after a xfrm transformation,
   so reset the skb encapsulation field to ensure nobody tries
   access the inner headers. Otherwise tunnel devices stacked
   on top of xfrm may build the outer headers based on wrong
   informations.

3) Add pmtu handling to vti, we need it to report
   pmtu informations for local generated packets.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>