e0eca57b6e
Missing limits.h. Upstream backport. Add extra backports. Replace Alpine Linux patch with upstream one. Same with patch 400. Signed-off-by: Rosen Penev <rosenp@gmail.com> Link: https://github.com/openwrt/openwrt/pull/17426 Signed-off-by: Robert Marko <robimarko@gmail.com>
85 lines
2.0 KiB
Diff
85 lines
2.0 KiB
Diff
From 7e23da91fca6e5dedeb32a7d308cf20982e897c3 Mon Sep 17 00:00:00 2001
|
|
From: Stephen Hemminger <stephen@networkplumber.org>
|
|
Date: Tue, 10 Dec 2024 13:38:08 -0800
|
|
Subject: [PATCH] ip: rearrange and prune header files
|
|
|
|
The recent report of issues with missing limits.h impacting musl
|
|
suggested looking at what files are and are not included in ip code.
|
|
|
|
The standard practice is to put standard headers first, then system,
|
|
then local headers. Used iwyu to get suggestions about missing
|
|
and extraneous headers.
|
|
|
|
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
---
|
|
ip/iplink.c | 13 +++++--------
|
|
ip/ipnetns.c | 19 +++++++++----------
|
|
2 files changed, 14 insertions(+), 18 deletions(-)
|
|
|
|
--- a/ip/iplink.c
|
|
+++ b/ip/iplink.c
|
|
@@ -11,17 +11,14 @@
|
|
#include <fcntl.h>
|
|
#include <dlfcn.h>
|
|
#include <errno.h>
|
|
+#include <string.h>
|
|
+#include <strings.h>
|
|
+#include <limits.h>
|
|
+
|
|
#include <sys/socket.h>
|
|
+#include <arpa/inet.h>
|
|
#include <linux/if.h>
|
|
-#include <linux/if_packet.h>
|
|
#include <linux/if_ether.h>
|
|
-#include <linux/sockios.h>
|
|
-#include <netinet/in.h>
|
|
-#include <arpa/inet.h>
|
|
-#include <string.h>
|
|
-#include <sys/ioctl.h>
|
|
-#include <stdbool.h>
|
|
-#include <linux/mpls.h>
|
|
|
|
#include "rt_names.h"
|
|
#include "utils.h"
|
|
--- a/ip/ipnetns.c
|
|
+++ b/ip/ipnetns.c
|
|
@@ -1,21 +1,21 @@
|
|
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#define _ATFILE_SOURCE
|
|
-#include <sys/file.h>
|
|
-#include <sys/types.h>
|
|
-#include <sys/stat.h>
|
|
-#include <sys/wait.h>
|
|
-#include <sys/inotify.h>
|
|
-#include <sys/mount.h>
|
|
-#include <sys/syscall.h>
|
|
+
|
|
#include <stdio.h>
|
|
+#include <stdint.h>
|
|
#include <string.h>
|
|
-#include <sched.h>
|
|
#include <fcntl.h>
|
|
#include <dirent.h>
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
#include <ctype.h>
|
|
-#include <linux/limits.h>
|
|
+#include <limits.h>
|
|
+
|
|
+#include <sys/file.h>
|
|
+#include <sys/types.h>
|
|
+#include <sys/stat.h>
|
|
+#include <sys/inotify.h>
|
|
+#include <sys/mount.h>
|
|
|
|
#include <linux/net_namespace.h>
|
|
|
|
@@ -23,7 +23,6 @@
|
|
#include "list.h"
|
|
#include "ip_common.h"
|
|
#include "namespace.h"
|
|
-#include "json_print.h"
|
|
|
|
static int usage(void)
|
|
{
|