From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 27 Jul 2025 20:42:43 +0000 (+0900)
Subject: include: update kernel headers from v6.16-rc7
X-Git-Tag: v258-rc2~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=706e622e88e37ab1ac9d0b8c3d60b1fa524d62d2;p=thirdparty%2Fsystemd.git

include: update kernel headers from v6.16-rc7

- netfilter changes in v6.16-rc1 were reverted,
- vm_sockets.h now includes sys/socket.h, hence our workaround is not
  necessary anymore.
---

diff --git a/src/include/uapi/linux/netfilter/nf_tables.h b/src/include/uapi/linux/netfilter/nf_tables.h
index 518ba144544..2beb30be2c5 100644
--- a/src/include/uapi/linux/netfilter/nf_tables.h
+++ b/src/include/uapi/linux/netfilter/nf_tables.h
@@ -142,8 +142,6 @@ enum nf_tables_msg_types {
 	NFT_MSG_DESTROYOBJ,
 	NFT_MSG_DESTROYFLOWTABLE,
 	NFT_MSG_GETSETELEM_RESET,
-	NFT_MSG_NEWDEV,
-	NFT_MSG_DELDEV,
 	NFT_MSG_MAX,
 };
 
@@ -1786,18 +1784,10 @@ enum nft_synproxy_attributes {
  * enum nft_device_attributes - nf_tables device netlink attributes
  *
  * @NFTA_DEVICE_NAME: name of this device (NLA_STRING)
- * @NFTA_DEVICE_TABLE: table containing the flowtable or chain hooking into the device (NLA_STRING)
- * @NFTA_DEVICE_FLOWTABLE: flowtable hooking into the device (NLA_STRING)
- * @NFTA_DEVICE_CHAIN: chain hooking into the device (NLA_STRING)
- * @NFTA_DEVICE_SPEC: hook spec matching the device (NLA_STRING)
  */
 enum nft_devices_attributes {
 	NFTA_DEVICE_UNSPEC,
 	NFTA_DEVICE_NAME,
-	NFTA_DEVICE_TABLE,
-	NFTA_DEVICE_FLOWTABLE,
-	NFTA_DEVICE_CHAIN,
-	NFTA_DEVICE_SPEC,
 	__NFTA_DEVICE_MAX
 };
 #define NFTA_DEVICE_MAX		(__NFTA_DEVICE_MAX - 1)
diff --git a/src/include/uapi/linux/netfilter/nfnetlink.h b/src/include/uapi/linux/netfilter/nfnetlink.h
index 88c3c5c73d0..b89a3e61b22 100644
--- a/src/include/uapi/linux/netfilter/nfnetlink.h
+++ b/src/include/uapi/linux/netfilter/nfnetlink.h
@@ -25,8 +25,6 @@ enum nfnetlink_groups {
 #define NFNLGRP_ACCT_QUOTA		NFNLGRP_ACCT_QUOTA
 	NFNLGRP_NFTRACE,
 #define NFNLGRP_NFTRACE			NFNLGRP_NFTRACE
-	NFNLGRP_NFT_DEV,
-#define NFNLGRP_NFT_DEV			NFNLGRP_NFT_DEV
 	__NFNLGRP_MAX,
 };
 #define NFNLGRP_MAX	(__NFNLGRP_MAX - 1)
diff --git a/src/include/uapi/linux/update.sh b/src/include/uapi/linux/update.sh
index 8976a185c80..31dcddaf95d 100755
--- a/src/include/uapi/linux/update.sh
+++ b/src/include/uapi/linux/update.sh
@@ -29,9 +29,5 @@ for i in *.h */*.h; do
             # add casts in ethtool_cmd_speed()
             sed -r -i '/return (ep->speed_hi << 16) | ep->speed;/ s/return .*;/return ((__u32) ep->speed_hi << 16) | (__u32) ep->speed;/' "$i"
             ;;
-        vm_sockets.h)
-            # the header requires struct sockaddr declared
-            sed -r -i '/#define _VM_SOCKETS_H/a \\n#include <sys/socket.h>' "$i"
-            ;;
     esac
 done
diff --git a/src/include/uapi/linux/vm_sockets.h b/src/include/uapi/linux/vm_sockets.h
index 2579fef5721..e401160e500 100644
--- a/src/include/uapi/linux/vm_sockets.h
+++ b/src/include/uapi/linux/vm_sockets.h
@@ -17,7 +17,7 @@
 #ifndef _VM_SOCKETS_H
 #define _VM_SOCKETS_H
 
-#include <sys/socket.h>
+#include <sys/socket.h>        /* for struct sockaddr and sa_family_t */
 
 #include <linux/socket.h>
 #include <linux/types.h>