Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hack 4.14 support for kernel 4.14.221 #2119

Closed
mfoxworthy opened this issue Oct 13, 2021 · 3 comments
Closed

hack 4.14 support for kernel 4.14.221 #2119

mfoxworthy opened this issue Oct 13, 2021 · 3 comments

Comments

@mfoxworthy
Copy link

I have tried to patch the kernel 4.14.221 with the hack that is using 4.14.174 and, as you may have expected, several chunks fail.

It doesn't appear to have many differences between 221 and 174 it's just that I'm not experienced enough in the kernel networking to be messing around in there.

I have considered moving to a supported kernel but the devices I am using, GL.iNet devices have features for the Goodcloud management system that I am using. I am basically stuck with Openwrt 19.07.7 for now and likely for a while.

Here is the output of the patch failure:

Applying /home/mfoxworthy/openwrt/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch using plaintext:
patching file Documentation/networking/ip-sysctl.txt
patching file drivers/infiniband/hw/cxgb4/cm.c
patching file include/linux/skbuff.h
patching file include/linux/tcp.h
Hunk #5 succeeded at 420 (offset 2 lines).
Hunk #6 succeeded at 469 (offset 2 lines).
Hunk #7 succeeded at 480 (offset 2 lines).
Hunk #8 succeeded at 504 (offset 2 lines).
patching file include/net/inet_common.h
patching file include/net/inet_connection_sock.h
patching file include/net/inet_sock.h
patching file include/net/mptcp.h
patching file include/net/mptcp_v4.h
patching file include/net/mptcp_v6.h
patching file include/net/net_namespace.h
patching file include/net/netns/mptcp.h
patching file include/net/snmp.h
patching file include/net/sock.h
Hunk #1 succeeded at 789 (offset 3 lines).
Hunk #2 succeeded at 1094 (offset 7 lines).
Hunk #3 succeeded at 1519 (offset 7 lines).
patching file include/net/tcp.h
patching file include/net/tcp_states.h
patching file include/net/transp_v6.h
patching file include/uapi/linux/if.h
patching file include/uapi/linux/tcp.h
patching file kernel/rcu/Kconfig.debug
patching file net/core/dev.c
Hunk #1 succeeded at 6832 (offset 63 lines).
patching file net/core/skbuff.c
Hunk #1 succeeded at 545 (offset 9 lines).
Hunk #2 succeeded at 1314 (offset 9 lines).
patching file net/core/sock.c
Hunk #4 succeeded at 1711 (offset 1 line).
patching file net/ipv4/af_inet.c
patching file net/ipv4/inet_connection_sock.c
Hunk #2 succeeded at 719 (offset 9 lines).
Hunk #3 succeeded at 816 (offset 9 lines).
Hunk #4 succeeded at 1018 (offset 9 lines).
Hunk #5 succeeded at 1035 (offset 9 lines).
patching file net/ipv4/ip_sockglue.c
patching file net/ipv4/Kconfig
Hunk #1 succeeded at 676 (offset 1 line).
Hunk #2 succeeded at 745 (offset 1 line).
Hunk #3 succeeded at 777 (offset 1 line).
patching file net/ipv4/syncookies.c
Hunk #8 FAILED at 423.
1 out of 8 hunks FAILED -- saving rejects to file net/ipv4/syncookies.c.rej
patching file net/ipv4/tcp.c
Hunk #20 succeeded at 2093 (offset 2 lines).
Hunk #21 succeeded at 2171 (offset 2 lines).
Hunk #22 succeeded at 2201 (offset 2 lines).
Hunk #23 succeeded at 2226 (offset 2 lines).
Hunk #24 succeeded at 2281 (offset 2 lines).
Hunk #25 succeeded at 2355 (offset 2 lines).
Hunk #26 succeeded at 2365 (offset 2 lines).
Hunk #27 succeeded at 2375 (offset 2 lines).
Hunk #28 succeeded at 2404 (offset 2 lines).
Hunk #29 succeeded at 2426 (offset 2 lines).
Hunk #30 succeeded at 2442 (offset 2 lines).
Hunk #31 succeeded at 2506 (offset 5 lines).
Hunk #32 succeeded at 2643 (offset 5 lines).
Hunk #33 succeeded at 2875 (offset 5 lines).
Hunk #34 succeeded at 2908 (offset 5 lines).
Hunk #35 FAILED at 2913.
Hunk #36 succeeded at 2966 (offset 2 lines).
Hunk #37 succeeded at 3045 (offset 2 lines).
Hunk #38 succeeded at 3082 (offset 2 lines).
Hunk #39 succeeded at 3152 (offset 2 lines).
Hunk #40 succeeded at 3260 (offset 2 lines).
Hunk #41 succeeded at 3422 (offset 2 lines).
Hunk #42 succeeded at 3680 (offset 5 lines).
Hunk #43 succeeded at 3698 (offset 5 lines).
Hunk #44 succeeded at 3713 (offset 5 lines).
Hunk #45 succeeded at 3722 (offset 5 lines).
Hunk #46 succeeded at 3730 (offset 5 lines).
1 out of 46 hunks FAILED -- saving rejects to file net/ipv4/tcp.c.rej
patching file net/ipv4/tcp_cong.c
Hunk #1 succeeded at 338 (offset 5 lines).
patching file net/ipv4/tcp_diag.c
patching file net/ipv4/tcp_fastopen.c
patching file net/ipv4/tcp_input.c
Hunk #10 succeeded at 2990 (offset 1 line).
Hunk #11 succeeded at 3058 (offset 1 line).
Hunk #12 succeeded at 3181 (offset 1 line).
Hunk #13 succeeded at 3295 (offset 1 line).
Hunk #14 succeeded at 3365 (offset 1 line).
Hunk #15 succeeded at 3587 (offset 2 lines).
Hunk #16 succeeded at 3694 with fuzz 1 (offset 2 lines).
Hunk #17 succeeded at 3783 (offset 3 lines).
Hunk #18 succeeded at 3870 (offset 3 lines).
Hunk #19 succeeded at 3938 (offset 3 lines).
Hunk #20 succeeded at 4097 (offset 3 lines).
Hunk #21 succeeded at 4112 (offset 3 lines).
Hunk #22 succeeded at 4138 (offset 3 lines).
Hunk #23 succeeded at 4169 (offset 3 lines).
Hunk #24 succeeded at 4379 (offset 3 lines).
Hunk #25 succeeded at 4433 (offset 3 lines).
Hunk #26 succeeded at 4459 (offset 3 lines).
Hunk #27 succeeded at 4501 (offset 3 lines).
Hunk #28 succeeded at 4518 (offset 3 lines).
Hunk #29 succeeded at 4594 (offset 7 lines).
Hunk #30 succeeded at 4642 (offset 7 lines).
Hunk #31 succeeded at 4658 (offset 7 lines).
Hunk #32 succeeded at 4672 (offset 11 lines).
Hunk #33 succeeded at 4746 (offset 11 lines).
Hunk #34 succeeded at 4778 (offset 11 lines).
Hunk #35 succeeded at 4800 (offset 11 lines).
Hunk #36 succeeded at 5143 (offset 11 lines).
Hunk #37 succeeded at 5178 (offset 11 lines).
Hunk #38 succeeded at 5192 (offset 11 lines).
Hunk #39 succeeded at 5219 (offset 11 lines).
Hunk #40 succeeded at 5328 (offset 11 lines).
Hunk #41 succeeded at 5474 (offset 11 lines).
Hunk #42 succeeded at 5536 (offset 11 lines).
Hunk #43 succeeded at 5711 (offset 13 lines).
Hunk #44 succeeded at 5726 (offset 13 lines).
Hunk #45 succeeded at 5737 (offset 13 lines).
Hunk #46 succeeded at 5761 (offset 13 lines).
Hunk #47 succeeded at 5793 (offset 13 lines).
Hunk #48 succeeded at 5859 (offset 13 lines).
Hunk #49 succeeded at 5914 (offset 13 lines).
Hunk #50 succeeded at 5944 (offset 13 lines).
Hunk #51 succeeded at 5988 (offset 13 lines).
Hunk #52 succeeded at 6005 (offset 13 lines).
Hunk #53 succeeded at 6068 (offset 13 lines).
Hunk #54 succeeded at 6111 (offset 13 lines).
Hunk #55 succeeded at 6178 (offset 13 lines).
Hunk #56 succeeded at 6197 (offset 13 lines).
Hunk #57 succeeded at 6221 (offset 13 lines).
Hunk #58 succeeded at 6292 (offset 13 lines).
Hunk #59 succeeded at 6302 (offset 13 lines).
Hunk #60 succeeded at 6310 (offset 13 lines).
Hunk #61 succeeded at 6322 (offset 13 lines).
Hunk #62 succeeded at 6345 (offset 13 lines).
Hunk #63 succeeded at 6443 (offset 13 lines).
Hunk #64 succeeded at 6539 (offset 13 lines).
Hunk #65 succeeded at 6567 (offset 13 lines).
Hunk #66 succeeded at 6580 (offset 13 lines).
Hunk #67 succeeded at 6617 (offset 13 lines).
Hunk #68 succeeded at 6631 (offset 13 lines).
patching file net/ipv4/tcp_ipv4.c
Hunk #20 succeeded at 1308 (offset 9 lines).
Hunk #21 succeeded at 1319 (offset 9 lines).
Hunk #22 succeeded at 1340 (offset 9 lines).
Hunk #23 succeeded at 1477 (offset 9 lines).
Hunk #24 succeeded at 1500 (offset 9 lines).
Hunk #25 succeeded at 1654 (offset 9 lines).
Hunk #26 succeeded at 1676 (offset 9 lines).
Hunk #27 succeeded at 1730 (offset 9 lines).
Hunk #28 succeeded at 1739 (offset 9 lines).
Hunk #29 succeeded at 1778 (offset 9 lines).
Hunk #30 succeeded at 1823 (offset 9 lines).
Hunk #31 succeeded at 1854 (offset 9 lines).
Hunk #32 succeeded at 1915 (offset 9 lines).
Hunk #33 succeeded at 1995 (offset 9 lines).
Hunk #34 succeeded at 2017 (offset 9 lines).
Hunk #35 succeeded at 2570 (offset 9 lines).
patching file net/ipv4/tcp_minisocks.c
patching file net/ipv4/tcp_output.c
Hunk #12 succeeded at 673 (offset 2 lines).
Hunk #13 succeeded at 708 (offset 2 lines).
Hunk #14 succeeded at 760 (offset 2 lines).
Hunk #15 succeeded at 777 (offset 2 lines).
Hunk #16 succeeded at 791 (offset 2 lines).
Hunk #17 succeeded at 822 (offset 2 lines).
Hunk #18 succeeded at 844 (offset 2 lines).
Hunk #19 succeeded at 873 (offset 2 lines).
Hunk #20 succeeded at 1117 (offset 2 lines).
Hunk #21 succeeded at 1177 (offset 2 lines).
Hunk #22 succeeded at 1189 (offset 2 lines).
Hunk #23 succeeded at 1202 (offset 2 lines).
Hunk #24 succeeded at 1234 (offset 2 lines).
Hunk #25 succeeded at 1400 (offset 2 lines).
Hunk #26 succeeded at 1622 (offset 2 lines).
Hunk #27 succeeded at 1646 (offset 2 lines).
Hunk #28 succeeded at 1705 (offset 3 lines).
Hunk #29 succeeded at 1764 (offset 3 lines).
Hunk #30 succeeded at 1798 (offset 3 lines).
Hunk #31 succeeded at 1825 (offset 3 lines).
Hunk #32 succeeded at 1840 (offset 3 lines).
Hunk #33 succeeded at 1853 (offset 3 lines).
Hunk #34 succeeded at 1864 (offset 3 lines).
Hunk #35 succeeded at 2022 (offset 3 lines).
Hunk #36 succeeded at 2322 (offset 3 lines).
Hunk #37 succeeded at 2353 (offset 3 lines).
Hunk #38 succeeded at 2367 (offset 3 lines).
Hunk #39 FAILED at 2475.
Hunk #40 succeeded at 2570 (offset 10 lines).
Hunk #41 succeeded at 2635 (offset 8 lines).
Hunk #42 succeeded at 2649 (offset 8 lines).
Hunk #43 succeeded at 2883 (offset 8 lines).
Hunk #44 succeeded at 3344 (offset 8 lines).
Hunk #45 succeeded at 3425 (offset 8 lines).
Hunk #46 succeeded at 3456 (offset 8 lines).
Hunk #47 succeeded at 3746 (offset 8 lines).
Hunk #48 succeeded at 3759 (offset 8 lines).
Hunk #49 succeeded at 3845 (offset 8 lines).
1 out of 49 hunks FAILED -- saving rejects to file net/ipv4/tcp_output.c.rej
patching file net/ipv4/tcp_timer.c
patching file net/ipv6/addrconf.c
patching file net/ipv6/af_inet6.c
patching file net/ipv6/ipv6_sockglue.c
Hunk #2 succeeded at 225 (offset 1 line).
patching file net/ipv6/syncookies.c
Hunk #6 FAILED at 262.
1 out of 6 hunks FAILED -- saving rejects to file net/ipv6/syncookies.c.rej
patching file net/ipv6/tcp_ipv6.c
Hunk #15 succeeded at 726 with fuzz 2.
Hunk #16 succeeded at 750 (offset -1 lines).
Hunk #17 succeeded at 771 (offset -1 lines).
Hunk #18 succeeded at 789 (offset -1 lines).
Hunk #19 succeeded at 809 (offset -1 lines).
Hunk #20 succeeded at 850 (offset -1 lines).
Hunk #21 succeeded at 907 (offset -1 lines).
Hunk #22 succeeded at 970 (offset -1 lines).
Hunk #23 succeeded at 979 (offset -1 lines).
Hunk #24 succeeded at 1019 (offset -1 lines).
Hunk #25 succeeded at 1041 (offset -1 lines).
Hunk #26 succeeded at 1067 (offset -1 lines).
Hunk #27 succeeded at 1108 (offset -1 lines).
Hunk #28 succeeded at 1163 (offset -1 lines).
Hunk #29 succeeded at 1299 (offset -1 lines).
Hunk #30 succeeded at 1316 (offset -1 lines).
Hunk #31 succeeded at 1446 (offset -1 lines).
Hunk #32 succeeded at 1463 (offset -1 lines).
Hunk #33 succeeded at 1517 (offset -1 lines).
Hunk #34 succeeded at 1562 (offset -1 lines).
Hunk #35 succeeded at 1579 (offset -1 lines).
Hunk #36 succeeded at 1606 (offset -1 lines).
Hunk #37 succeeded at 1637 (offset -1 lines).
Hunk #38 succeeded at 1702 (offset -1 lines).
Hunk #39 succeeded at 1767 (offset -1 lines).
Hunk #40 succeeded at 1804 (offset -1 lines).
Hunk #41 succeeded at 1840 (offset -1 lines).
Hunk #42 succeeded at 1854 (offset -1 lines).
Hunk #43 succeeded at 2088 (offset -1 lines).
patching file net/Kconfig
patching file net/Makefile
patching file net/mptcp/Kconfig
patching file net/mptcp/Makefile
patching file net/mptcp/mptcp_balia.c
patching file net/mptcp/mptcp_binder.c
patching file net/mptcp/mptcp_coupled.c
patching file net/mptcp/mptcp_ctrl.c
patching file net/mptcp/mptcp_fullmesh.c
patching file net/mptcp/mptcp_input.c
patching file net/mptcp/mptcp_ipv4.c
patching file net/mptcp/mptcp_ipv6.c
patching file net/mptcp/mptcp_ndiffports.c
patching file net/mptcp/mptcp_olia.c
patching file net/mptcp/mptcp_output.c
patching file net/mptcp/mptcp_pm.c
patching file net/mptcp/mptcp_redundant.c
patching file net/mptcp/mptcp_rr.c
patching file net/mptcp/mptcp_sched.c
patching file net/mptcp/mptcp_wvegas.c
Patch failed! Please fix /home/mfoxworthy/openwrt/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch!
make[3]: *** [Makefile:28: /home/mfoxworthy/openwrt/build_dir/target-mips_24kc_musl/linux-ath79_nand/linux-4.14.221/.prepared_2233f50c716e4c424af80f89fc4fc68a] Error 1
make[3]: Leaving directory '/home/mfoxworthy/openwrt/target/linux/ath79'
make[2]: *** [Makefile:13: prepare] Error 2
make[2]: Leaving directory '/home/mfoxworthy/openwrt/target/linux'
time: target/linux/prepare#9.31#6.19#10.32
make[1]: *** [target/Makefile:25: target/linux/prepare] Error 2
make[1]: Leaving directory '/home/mfoxworthy/openwrt'
make: *** [/home/mfoxworthy/openwrt/include/toplevel.mk:227: target/linux/prepare] Error 2

Thanks in advance,

Michael

@Ysurac
Copy link
Owner

Ysurac commented Oct 13, 2021

I don't maintain 4.14 kernel any more.
You can try to make an updated patch from https://github.com/multipath-tcp/mptcp/tree/mptcp_v0.94

@mfoxworthy
Copy link
Author

I noticed that you have told others the same. I figured that would be the answer, but it was worth asking anyway. :)

I'll try patching it myself.

Thanks.

@github-actions
Copy link

This issue is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 5 days

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants