diff --git a/root/target/linux/generic/config-4.14 b/root/target/linux/generic/config-4.14 index a1652d1a..1b717833 100644 --- a/root/target/linux/generic/config-4.14 +++ b/root/target/linux/generic/config-4.14 @@ -2825,6 +2825,7 @@ CONFIG_MTD_SPLIT_SUPPORT=y # CONFIG_MTD_TESTS is not set # CONFIG_MTD_UBI is not set # CONFIG_MTD_UIMAGE_SPLIT is not set +# CONFIG_MTD_VIRT_CONCAT is not set CONFIG_MULTIUSER=y # CONFIG_MUTEX_SPIN_ON_OWNER is not set # CONFIG_MV643XX_ETH is not set @@ -3143,6 +3144,7 @@ CONFIG_NFS_V3=y # CONFIG_NFT_DUP_IPV6 is not set # CONFIG_NFT_FIB_IPV4 is not set # CONFIG_NFT_FIB_IPV6 is not set +# CONFIG_NFT_FIB_NETDEV is not set # CONFIG_NFT_FLOW_OFFLOAD is not set # CONFIG_NFT_OBJREF is not set # CONFIG_NFT_RT is not set @@ -3301,6 +3303,7 @@ CONFIG_NMI_LOG_BUF_SHIFT=13 # CONFIG_OPROFILE is not set # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set # CONFIG_OPT3001 is not set +CONFIG_OPTIMIZE_INLINING=y # CONFIG_ORANGEFS_FS is not set # CONFIG_ORION_WATCHDOG is not set # CONFIG_OSF_PARTITION is not set diff --git a/root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch b/root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch index 966c81f2..dba93d56 100644 --- a/root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch +++ b/root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch @@ -5573,14 +5573,13 @@ diff -aurN a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c { u32 end_seq = TCP_SKB_CB(skb)->end_seq; -@@ -1893,7 +1933,7 @@ +@@ -1893,4 +1933,7 @@ struct sk_buff *head; int win_divisor; -- if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN) + if ((TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN) || mptcp_is_data_fin(skb)) - goto send_now; - ++ goto send_now; ++ if (icsk->icsk_ca_state >= TCP_CA_Recovery) @@ -2266,7 +2306,7 @@ * Returns true, if no segments are in flight and we have queued segments,