Skip to contentSkip to conversation

ip_queue removal

RFC PATCH New [email protected] 1 participant 2 messages Jan 16, 2012

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

RFC PATCH 1/1 ip_queue removal

From: Pablo Neira Ayuso <[email protected]>

Hi,

I'm thinking about pushing the following patch to net-next once becomes active.

Does anyone have any compelling reason to keep ip_queue still in the tree?

Pablo Neira Ayuso (1):
netfilter: remove ip_queue support

 Documentation/ABI/removed/ip_queue      |    9 +
 include/linux/netfilter_ipv4/ip_queue.h |   72 ----
 include/linux/netlink.h                 |    2 +-
 net/ipv4/netfilter/Makefile             |    3 -
 net/ipv4/netfilter/ip_queue.c           |  639 -------------------------------
 5 files changed, 10 insertions(+), 715 deletions(-)
 create mode 100644 Documentation/ABI/removed/ip_queue
 delete mode 100644 include/linux/netfilter_ipv4/ip_queue.h
 delete mode 100644 net/ipv4/netfilter/ip_queue.c
Signature · 1 line
1.7.7.3
author maintainer
#1 lore raw

PATCH 1/1 netfilter: remove ip_queue support

From: Pablo Neira Ayuso <[email protected]>

This patch removes ip_queue support which was marked as obsolete years ago. The nfnetlink_queue modules provides more advanced user-space packet queueing mechanism.

---
 Documentation/ABI/removed/ip_queue      |    9 +
 include/linux/netfilter_ipv4/ip_queue.h |   72 ----
 include/linux/netlink.h                 |    2 +-
 net/ipv4/netfilter/Makefile             |    3 -
 net/ipv4/netfilter/ip_queue.c           |  639 -------------------------------
 5 files changed, 10 insertions(+), 715 deletions(-)
 create mode 100644 Documentation/ABI/removed/ip_queue
 delete mode 100644 include/linux/netfilter_ipv4/ip_queue.h
 delete mode 100644 net/ipv4/netfilter/ip_queue.c
Documentation/ABI/removed/ip_queue new file +9 -0
new file mode 100644
index 0000000..572c9f7
@@ -0,0 +1,9 @@
+What:		ip_queue
+Date:		finally removed in kernel v3.4.0
+Contact:	Pablo Neira Ayuso <[email protected]>
+Description:
+	ip_queue has been replaced by nfnetlink_queue which provides
+	more advanced queueing mechanism to user-space. The ip_queue
+	module was already announced to become obsolete years ago.
+
+Users:
include/linux/netfilter_ipv4/ip_queue.h deleted +0 -72

72 lines not on this page · raw message

include/linux/netlink.h +1 -1
index 52e4895..b0327f1 100644
@@ -7,7 +7,7 @@
 #define NETLINK_ROUTE		0	/* Routing/device hook				*/
 #define NETLINK_UNUSED		1	/* Unused number				*/
 #define NETLINK_USERSOCK	2	/* Reserved for user mode socket protocols 	*/
-#define NETLINK_FIREWALL	3	/* Firewalling hook				*/
+#define NETLINK_FIREWALL	3	/* Unused, we now use NETLINK_NETFILTER		*/
 #define NETLINK_SOCK_DIAG	4	/* socket monitoring				*/
 #define NETLINK_NFLOG		5	/* netfilter/iptables ULOG */
 #define NETLINK_XFRM		6	/* ipsec */
net/ipv4/netfilter/Makefile +0 -3
index 213a462..83aac6e 100644
@@ -67,6 +67,3 @@ obj-$(CONFIG_IP_NF_ARP_MANGLE) += arpt_mangle.o
 
 # just filtering instance of ARP tables for now
 obj-$(CONFIG_IP_NF_ARPFILTER) += arptable_filter.o
-
-obj-$(CONFIG_IP_NF_QUEUE) += ip_queue.o
-
net/ipv4/netfilter/ip_queue.c deleted +0 -639

639 lines not on this page · raw message

Signature · 1 line
1.7.7.3