diff options
author | David S. Miller <davem@davemloft.net> | 2013-03-27 14:07:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-27 14:07:04 -0400 |
commit | 0fb031f036385af1e1de87ac3e98a2afba2139ae (patch) | |
tree | 78a2afe0afa772fc1847e1ad486ef950ab8cfa73 /drivers/input | |
parent | 24f11a5cf538a8fcc10d61f457e9a2094fb965b4 (diff) | |
parent | 799ef90c55e692e096d8bd9e5871b95264b1e9ba (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says:
====================
1) Initialize the satype field in key_notify_policy_flush(),
this was left uninitialized. From Nicolas Dichtel.
2) The sequence number difference for replay notifications
was misscalculated on ESN sequence number wrap. We need
a separate replay notify function for esn.
3) Fix an off by one in the esn replay notify function.
From Mathias Krause.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/input')
0 files changed, 0 insertions, 0 deletions