# # Makefile for the Linux AX.25 layer. # obj-$(CONFIG_AX25) += ax25.o ax25-y := ax25_addr.o ax25_dev.o ax25_iface.o ax25_in.o ax25_ip.o ax25_out.o \ ax25_route.o ax25_std_in.o ax25_std_subr.o ax25_std_timer.o \ ax25_subr.o ax25_timer.o ax25_uid.o af_ax25.o ax25-$(CONFIG_AX25_DAMA_SLAVE) += ax25_ds_in.o ax25_ds_subr.o ax25_ds_timer.o ax25-$(CONFIG_SYSCTL) += sysctl_net_ax25.o c?h=nds-private-remove' type='application/atom+xml'/>
summaryrefslogtreecommitdiff
path: root/net/rxrpc/sysctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-10 09:47:13 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-10 09:47:13 -0800
commit045169816b31b10faed984b01c390db1b32ee4c1 (patch)
treeecb1d0c763f3d8cb0af749717b66ac47e6981d33 /net/rxrpc/sysctl.c
parentcd6628953e4216b65e7d91ab70ff8e5b65c9fde9 (diff)
parent678b5c6b22fed89a13d5b2267f423069a9b11c80 (diff)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: "This fixes the following issues: - Fix pointer size when caam is used with AArch64 boot loader on AArch32 kernel. - Fix ahash state corruption in marvell driver. - Fix buggy algif_aed tag handling. - Prevent mcryptd from being used with incompatible algorithms which can cause crashes" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: algif_aead - fix uninitialized variable warning crypto: mcryptd - Check mcryptd algorithm compatibility crypto: algif_aead - fix AEAD tag memory handling crypto: caam - fix pointer size for AArch64 boot loader, AArch32 kernel crypto: marvell - Don't corrupt state of an STD req for re-stepped ahash crypto: marvell - Don't copy hash operation twice into the SRAM
Diffstat (limited to 'net/rxrpc/sysctl.c')