[PATCH iproute2-next] mptcp: cleanup include section.

Paolo Abeni posted 1 patch 1 week, 2 days ago
Failed in applying to current master (apply log)
ip/ipmptcp.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

[PATCH iproute2-next] mptcp: cleanup include section.

Posted by Paolo Abeni 1 week, 2 days ago
From: Stephen Hemminger <stephen@networkplumber.org>

David reported ipmptcp breaks hard the build when updating the
relevant kernel headers.

We should be more careful in the header section, explicitly
including all the required dependencies respecting the usual order
between systems and local headers.

Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
Notes:
- sorry for the long turn-around time
- all English errors added by me
- I [mis]understood Stephen's patch was the preferred one, and I took
  the liberty to send the patch on his behalf. Please educate me if
  I somewhat screwed-up this badly
---
 ip/ipmptcp.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ip/ipmptcp.c b/ip/ipmptcp.c
index fd042da8..0f5b6e2d 100644
--- a/ip/ipmptcp.c
+++ b/ip/ipmptcp.c
@@ -1,17 +1,23 @@
 // SPDX-License-Identifier: GPL-2.0
 
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <stdbool.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <rt_names.h>
-#include <errno.h>
 
 #include <linux/genetlink.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
 #include <linux/mptcp.h>
 
 #include "utils.h"
 #include "ip_common.h"
-#include "libgenl.h"
 #include "json_print.h"
+#include "libgenl.h"
+#include "libnetlink.h"
+#include "ll_map.h"
 
 static void usage(void)
 {
-- 
2.26.3


Re: [PATCH iproute2-next] mptcp: cleanup include section.

Posted by David Ahern 6 days, 13 hours ago
On 10/12/21 9:39 AM, Paolo Abeni wrote:
> From: Stephen Hemminger <stephen@networkplumber.org>
> 
> David reported ipmptcp breaks hard the build when updating the
> relevant kernel headers.
> 
> We should be more careful in the header section, explicitly
> including all the required dependencies respecting the usual order
> between systems and local headers.
> 
> Stephen Hemminger <stephen@networkplumber.org>
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> ---
> Notes:
> - sorry for the long turn-around time
> - all English errors added by me
> - I [mis]understood Stephen's patch was the preferred one, and I took
>   the liberty to send the patch on his behalf. Please educate me if
>   I somewhat screwed-up this badly
> ---
>  ip/ipmptcp.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 

applied before the latest sync and it worked before and after. thank you!