From d70e174ca065a1adbc126cedc60165123f7151eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <j@v6e.pt>
Date: Tue, 31 Jan 2023 20:14:26 +0000
Subject: [PATCH] Remove wsutil/netlink.h workaround

---
 capture/ws80211_utils.c |  6 ----
 extcap/dpauxmon.c       |  1 -
 wsutil/CMakeLists.txt   |  1 -
 wsutil/netlink.h        | 65 -----------------------------------------
 4 files changed, 73 deletions(-)
 delete mode 100644 wsutil/netlink.h

diff --git a/capture/ws80211_utils.c b/capture/ws80211_utils.c
index 06a8c4a5a9..66d7918079 100644
--- a/capture/ws80211_utils.c
+++ b/capture/ws80211_utils.c
@@ -28,20 +28,14 @@ SPDX-License-Identifier: ISC
 #include <net/if.h>
 #include <sys/ioctl.h>
 
-DIAG_OFF_PEDANTIC
 #include <netlink/genl/genl.h>
-DIAG_ON_PEDANTIC
 #include <netlink/genl/family.h>
 #include <netlink/genl/ctrl.h>
-DIAG_OFF_PEDANTIC
 #include <netlink/msg.h>
-DIAG_ON_PEDANTIC
 #include <netlink/attr.h>
 
 #include <linux/nl80211.h>
 
-#include <wsutil/netlink.h>
-
 #ifdef HAVE_NL80211_SPLIT_WIPHY_DUMP
 static int ws80211_get_protocol_features(int* features);
 #endif /* HAVE_NL80211_SPLIT_WIPHY_DUMP */
diff --git a/extcap/dpauxmon.c b/extcap/dpauxmon.c
index 4623634336..7b74405536 100644
--- a/extcap/dpauxmon.c
+++ b/extcap/dpauxmon.c
@@ -19,7 +19,6 @@
 
 #include <wsutil/strtoi.h>
 #include <wsutil/filesystem.h>
-#include <wsutil/netlink.h>
 #include <wsutil/privileges.h>
 #include <wsutil/wslog.h>
 #include <writecap/pcapio.h>
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index bfa69a5965..bdc1f0f9eb 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -60,7 +60,6 @@ set(WSUTIL_PUBLIC_HEADERS
 	jsmn.h
 	json_dumper.h
 	mpeg-audio.h
-	netlink.h
 	nstime.h
 	os_version_info.h
 	pint.h
diff --git a/wsutil/netlink.h b/wsutil/netlink.h
deleted file mode 100644
index f39c2988b5..0000000000
--- a/wsutil/netlink.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/** @file
- *
- * netlink-related definitions shared between libwireshark and other parts
- *
- * Copyright 2018, Martin Kaiser
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-#ifndef _WS_NETLINK_H
-#define _WS_NETLINK_H
-
-#if defined(HAVE_LIBNL)
-
-/*
- * Pull in the include files where the kernel's nla_for_each_nested is defined.
- * This is to make sure that the kernel's definition will not overwrite our
- * version if msg.h or attr.h are included again explicitly after this file.
- */
-DIAG_OFF_PEDANTIC
-#include <netlink/msg.h>
-DIAG_ON_PEDANTIC
-#include <netlink/attr.h>
-
-/*
- * And now for a steaming heap of suck.
- *
- * The nla_for_each_nested() macro defined by at least some versions of the
- * Linux kernel's headers doesn't do the casting required when compiling
- * with a C++ compiler or with -Wc++-compat, so we get warnings, and those
- * warnings are fatal when we compile this file.
- *
- * So we replace it with our own version, which does the requisite cast.
- */
-
-/**
- * nla_for_each_nested - iterate over nested attributes
- * @pos: loop counter, set to current attribute
- * @nla: attribute containing the nested attributes
- * @rem: initialized to len, holds bytes currently remaining in stream
- */
-#undef nla_for_each_nested
-#define nla_for_each_nested(pos, nla, rem) \
-    nla_for_each_attr(pos, (struct nlattr *)nla_data(nla), nla_len(nla), rem)
-
-#endif /* HAVE_LIBNL */
-
-#endif /* _WS_NETLINK_H */
-
-/*
- * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
- *
- * Local variables:
- * c-basic-offset: 4
- * tab-width: 8
- * indent-tabs-mode: nil
- * End:
- *
- * vi: set shiftwidth=4 tabstop=8 expandtab:
- * :indentSize=4:tabSize=8:noTabs=true:
- */