OSDN Git Service

Merge changes from topic "xfrmi-support"
authorBenedict Wong <benedictwong@google.com>
Mon, 26 Nov 2018 03:04:16 +0000 (03:04 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 26 Nov 2018 03:04:16 +0000 (03:04 +0000)
commitf928c1e4b9121d9b65dbcdd7932f1ffff25bffc3
tree26a7c98b7201c914bd249fee6dcd06921c95789f
parent1c66fd2d677ce749dfddfba93c15305d6eca89ee
parentb29205728283e260893f48fcef6263369f2f0949
Merge changes from topic "xfrmi-support"

* changes:
  Cleanup and update comments SA mark disabling comments
  Add XFRM-I support to IpSecService
  Disable attempted updating of SA marks