diff options
| author | David Howells <dhowells@redhat.com> | 2016-04-07 17:23:51 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-11 15:34:41 -0400 |
| commit | 648af7fca15901740c7aaafd55904ebd54d01860 (patch) | |
| tree | 5aaa5a3d4b192da7bc9bb268d39038c60c068125 /net/rxrpc/Makefile | |
| parent | 6dd050f88d702e2718bd856ea014487563207756 (diff) | |
| download | blackbird-op-linux-648af7fca15901740c7aaafd55904ebd54d01860.tar.gz blackbird-op-linux-648af7fca15901740c7aaafd55904ebd54d01860.zip | |
rxrpc: Absorb the rxkad security module
Absorb the rxkad security module into the af_rxrpc module so that there's
only one module file. This avoids a circular dependency whereby rxkad pins
af_rxrpc and cached connections pin rxkad but can't be manually evicted
(they will expire eventually and cease pinning).
With this change, af_rxrpc can just be unloaded, despite having cached
connections.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc/Makefile')
| -rw-r--r-- | net/rxrpc/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/rxrpc/Makefile b/net/rxrpc/Makefile index 5b98c1640d6d..fa09cb55bfce 100644 --- a/net/rxrpc/Makefile +++ b/net/rxrpc/Makefile @@ -22,8 +22,7 @@ af-rxrpc-y := \ misc.o af-rxrpc-$(CONFIG_PROC_FS) += ar-proc.o +af-rxrpc-$(CONFIG_RXKAD) += rxkad.o af-rxrpc-$(CONFIG_SYSCTL) += sysctl.o obj-$(CONFIG_AF_RXRPC) += af-rxrpc.o - -obj-$(CONFIG_RXKAD) += rxkad.o |
