From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steffen Klassert Subject: pull request (net-next): ipsec-next 2018-10-01 Date: Mon, 1 Oct 2018 11:16:06 +0200 Message-ID: <20181001091609.16646-1-steffen.klassert@secunet.com> Mime-Version: 1.0 Content-Type: text/plain Cc: Herbert Xu , Steffen Klassert , To: David Miller Return-path: Received: from a.mx.secunet.com ([62.96.220.36]:41668 "EHLO a.mx.secunet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729019AbeJAPxM (ORCPT ); Mon, 1 Oct 2018 11:53:12 -0400 Sender: netdev-owner@vger.kernel.org List-ID: 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. Thanks! The following changes since commit 817e60a7a2bb1f22052f18562990d675cb3a3762: Merge branch 'nfp-add-NFP5000-support' (2018-08-28 16:01:48 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master for you to fetch changes up to 4a132095dd64fefabdc5dad1cd9e9809b126e582: xfrm: allow driver to quietly refuse offload (2018-08-29 08:04:44 +0200) ---------------------------------------------------------------- Haishuang Yan (1): esp: remove redundant define esph Shannon Nelson (1): xfrm: allow driver to quietly refuse offload Wei Yongjun (1): xfrm: Make function xfrmi_get_link_net() static Documentation/networking/xfrm_device.txt | 4 ++++ net/ipv4/esp4.c | 7 +++---- net/ipv6/esp6.c | 7 +++---- net/xfrm/xfrm_device.c | 6 +++++- net/xfrm/xfrm_interface.c | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-)