diff options
author | David S. Miller <davem@davemloft.net> | 2018-10-01 22:31:17 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-10-01 22:31:17 -0700 |
commit | 2240c12d7d3de741ffbcf22d7a96358a450051ac (patch) | |
tree | bf64abfcc23e730ffb74ead92213dc95f41fc548 /Documentation | |
parent | 3bd09b05b0689497d8f2e33ae983b1ee10d15eeb (diff) | |
parent | 4a132095dd64fefabdc5dad1cd9e9809b126e582 (diff) | |
download | linux-2240c12d7d3de741ffbcf22d7a96358a450051ac.tar.gz linux-2240c12d7d3de741ffbcf22d7a96358a450051ac.tar.bz2 linux-2240c12d7d3de741ffbcf22d7a96358a450051ac.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
pull request (net-next): ipsec-next 2018-10-01
1) Make xfrmi_get_link_net() static to silence a sparse warning.
From Wei Yongjun.
2) Remove a unused esph pointer definition in esp_input().
From Haishuang Yan.
3) Allow the NIC driver to quietly refuse xfrm offload
in case it does not support it, the SA is created
without offload in this case.
From Shannon Nelson.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/networking/xfrm_device.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/networking/xfrm_device.txt b/Documentation/networking/xfrm_device.txt index 50c34ca65efe..267f55b5f54a 100644 --- a/Documentation/networking/xfrm_device.txt +++ b/Documentation/networking/xfrm_device.txt @@ -68,6 +68,10 @@ and an indication of whether it is for Rx or Tx. The driver should - verify the algorithm is supported for offloads - store the SA information (key, salt, target-ip, protocol, etc) - enable the HW offload of the SA + - return status value: + 0 success + -EOPNETSUPP offload not supported, try SW IPsec + other fail the request The driver can also set an offload_handle in the SA, an opaque void pointer that can be used to convey context into the fast-path offload requests. |