Thread (11 messages) 11 messages, 2 authors, 2023-01-14

Re: [PATCH ethtool 1/3] misc: Fix build with kernel headers < v4.11

From: Florian Fainelli <f.fainelli@gmail.com>
Date: 2023-01-14 00:11:31


On 1/13/2023 3:57 PM, Michal Kubecek wrote:
On Fri, Jan 13, 2023 at 03:31:46PM -0800, Florian Fainelli wrote:
quoted
Not all toolchain kernel headers may contain upstream commit
2618be7dccf8739b89e1906b64bd8d551af351e6 ("uapi: fix linux/if.h
userspace compilation errors") which is included in v4.11 and onwards.
Err on the side of caution by including sys/socket.h ahead of including
linux/if.h.

Fixes: 1fa60003a8b8 ("misc: header includes cleanup")
Reported-by: Markus Mayer <mmayer@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
  internal.h | 1 +
  1 file changed, 1 insertion(+)
diff --git a/internal.h b/internal.h
index b80f77afa4c0..f7aaaf5229f4 100644
--- a/internal.h
+++ b/internal.h
@@ -21,6 +21,7 @@
  #include <unistd.h>
  #include <endian.h>
  #include <sys/ioctl.h>
+#include <sys/socket.h>
  #include <linux/if.h>
  
  #include "json_writer.h"
No objection but I wonder if it wouldn't make sense to add linux/if.h to
the header copies in uapi/ instead as then we could also drop the
fallback definition of ALTIFNAMSIZ and perhaps more similar hacks.
Humm, I wondered about that but it seems like opening a possible can of 
worms as the history of include/uapi/linux/if.h changed across multiple 
versions. As long as it does compile, why not :)
-- 
Florian
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help