Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f8bf0c5 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm: generic_defconfig: Enable CONFIG_BLK_INLINE_ENCRYPTION"

parents 93a67a0d ac6baffb

arch/arm/configs/generic_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODULE_SIG=y

CONFIG_BLK_INLINE_ENCRYPTION=y

CONFIG_PARTITION_ADVANCED=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_CMA=y

net/netfilter/nf_conntrack_sip.c

+1 −1
Original line number Diff line number Diff line
@@ -1877,7 +1877,7 @@ static int process_sip_msg(struct sk_buff *skb, struct nf_conn *ct, 
}



static void sip_tcp_skip_process(int ret, struct nf_conn *ct, struct sk_buff *skb,

				 unsigned int protoff, s16 *tdiff)

				 unsigned int protoff, s16 tdiff)

{

	if (ret == NF_ACCEPT && ct && ct->status & IPS_NAT_MASK) {

		const struct nf_nat_sip_hooks *hooks;