diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-22 16:04:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-22 16:04:41 -0700 |
| commit | baf3b3f227e6d2c143a03f03dcbd50b55089eda4 (patch) | |
| tree | 3744aa127aa718733ab3712bd40dac62d207511e /net/ipv4/tcp_probe.c | |
| parent | 3bca8de22082f6c02a176dbb344e5234d9d5cc02 (diff) | |
| parent | e3fec5a1c5a1ab4a85ca3f4e41c626fb953ce162 (diff) | |
| download | op-kernel-dev-baf3b3f227e6d2c143a03f03dcbd50b55089eda4.zip op-kernel-dev-baf3b3f227e6d2c143a03f03dcbd50b55089eda4.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
1) Some constifications, from Mathias Krause.
2) Catch bugs if a hold timer is still active when xfrm_policy_destroy()
is called, from Fan Du.
3) Remove a redundant address family checking, from Fan Du.
4) Make xfrm_state timer monotonic to be independent of system clock changes,
from Fan Du.
5) Remove an outdated comment on returning -EREMOTE in the xfrm_lookup(),
from Rami Rosen.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_probe.c')
0 files changed, 0 insertions, 0 deletions
