summaryrefslogtreecommitdiffstats
path: root/net/xfrm/Makefile
diff options
context:
space:
mode:
authorHangbin Liu <liuhangbin@gmail.com>2017-06-01 08:57:56 +0200
committerSteffen Klassert <steffen.klassert@secunet.com>2017-06-07 08:16:27 +0200
commitb81f884a547b5c264c13fdfaa3b65cf994bf1dcf (patch)
tree55148c38ede04d6e2960ffa5d09aa91d19cf301e /net/xfrm/Makefile
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
downloadlinux-b81f884a547b5c264c13fdfaa3b65cf994bf1dcf.tar.xz
linux-b81f884a547b5c264c13fdfaa3b65cf994bf1dcf.zip
xfrm: fix xfrm_dev_event() missing when compile without CONFIG_XFRM_OFFLOAD
In commit d77e38e612a0 ("xfrm: Add an IPsec hardware offloading API") we make xfrm_device.o only compiled when enable option CONFIG_XFRM_OFFLOAD. But this will make xfrm_dev_event() missing if we only enable default XFRM options. Then if we set down and unregister an interface with IPsec on it. there will no xfrm_garbage_collect(), which will cause dev usage count hold and get error like: unregister_netdevice: waiting for <dev> to become free. Usage count = 4 Fixes: d77e38e612a0 ("xfrm: Add an IPsec hardware offloading API") Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/xfrm/Makefile')
-rw-r--r--net/xfrm/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/xfrm/Makefile b/net/xfrm/Makefile
index abf81b329dc1..55b2ac300995 100644
--- a/net/xfrm/Makefile
+++ b/net/xfrm/Makefile
@@ -4,8 +4,7 @@
obj-$(CONFIG_XFRM) := xfrm_policy.o xfrm_state.o xfrm_hash.o \
xfrm_input.o xfrm_output.o \
- xfrm_sysctl.o xfrm_replay.o
-obj-$(CONFIG_XFRM_OFFLOAD) += xfrm_device.o
+ xfrm_sysctl.o xfrm_replay.o xfrm_device.o
obj-$(CONFIG_XFRM_STATISTICS) += xfrm_proc.o
obj-$(CONFIG_XFRM_ALGO) += xfrm_algo.o
obj-$(CONFIG_XFRM_USER) += xfrm_user.o