diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-11-01 19:27:46 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-01 19:27:46 +0900 |
| commit | 122f00cdc1bb27cb0ff4b0a8cffa3bb27f61f949 (patch) | |
| tree | d4ee44d28cf00a6a355f7f6eba870a3d1acaafcd /net/ipx | |
| parent | mlxsw: reg: Add high and low temperature thresholds (diff) | |
| parent | xfrm: Fix GSO for IPsec with GRE tunnel. (diff) | |
| download | linux-dev-122f00cdc1bb27cb0ff4b0a8cffa3bb27f61f949.tar.xz linux-dev-122f00cdc1bb27cb0ff4b0a8cffa3bb27f61f949.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
pull request (net): ipsec 2017-11-01
1) Fix a memleak when a packet matches a policy
without a matching state.
2) Reset the socket cached dst_entry when inserting
a socket policy, otherwise the policy might be
ignored. From Jonathan Basseri.
3) Fix GSO for a IPsec, GRE tunnel combination.
We reset the encapsulation field at the skb
too erly, as a result GRE does not segment
GSO packets. Fix this by resetting the the
encapsulation field right before the
transformation where the inner headers get
invalid.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipx')
0 files changed, 0 insertions, 0 deletions