Commit ba24ea12 authored by Jamal Hadi Salim's avatar Jamal Hadi Salim Committed by David S. Miller
Browse files

net/sched: Retire ipt action 



The tc ipt action was intended to run all netfilter/iptables target.
Unfortunately it has not benefitted over the years from proper updates when
netfilter changes, and for that reason it has remained rudimentary.
Pinging a bunch of people that i was aware were using this indicates that
removing it wont affect them.
Retire it to reduce maintenance efforts. Buh-bye.

Reviewed-by: default avatarVictor Noguiera <victor@mojatatu.com>
Reviewed-by: default avatarPedro Tammela <pctammela@mojatatu.com>
Signed-off-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 993498e5

include/net/tc_act/tc_ipt.h

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __NET_TC_IPT_H

#define __NET_TC_IPT_H



#include <net/act_api.h>



struct xt_entry_target;



struct tcf_ipt {

	struct tc_action	common;

	u32			tcfi_hook;

	char			*tcfi_tname;

	struct xt_entry_target	*tcfi_t;

};

#define to_ipt(a) ((struct tcf_ipt *)a)



#endif /* __NET_TC_IPT_H */

include/net/tc_wrapper.h

+0 −4
Original line number Diff line number Diff line
@@ -117,10 +117,6 @@ static inline int tc_act(struct sk_buff *skb, const struct tc_action *a, 
	if (a->ops->act == tcf_ife_act)

		return tcf_ife_act(skb, a, res);

#endif

#if IS_BUILTIN(CONFIG_NET_ACT_IPT)

	if (a->ops->act == tcf_ipt_act)

		return tcf_ipt_act(skb, a, res);

#endif

#if IS_BUILTIN(CONFIG_NET_ACT_SIMP)

	if (a->ops->act == tcf_simp_act)

		return tcf_simp_act(skb, a, res);

include/uapi/linux/pkt_cls.h

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ enum { 
 * versions.

 */

#define TCA_ACT_GACT 5

#define TCA_ACT_IPT 6

#define TCA_ACT_IPT 6 /* obsoleted, can be reused */

#define TCA_ACT_PEDIT 7

#define TCA_ACT_MIRRED 8

#define TCA_ACT_NAT 9
@@ -120,7 +120,7 @@ enum tca_id { 
	TCA_ID_UNSPEC = 0,

	TCA_ID_POLICE = 1,

	TCA_ID_GACT = TCA_ACT_GACT,

	TCA_ID_IPT = TCA_ACT_IPT,

	TCA_ID_IPT = TCA_ACT_IPT, /* Obsoleted, can be reused */

	TCA_ID_PEDIT = TCA_ACT_PEDIT,

	TCA_ID_MIRRED = TCA_ACT_MIRRED,

	TCA_ID_NAT = TCA_ACT_NAT,

include/uapi/linux/tc_act/tc_ipt.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef __LINUX_TC_IPT_H

#define __LINUX_TC_IPT_H



#include <linux/pkt_cls.h>



enum {

	TCA_IPT_UNSPEC,

	TCA_IPT_TABLE,

	TCA_IPT_HOOK,

	TCA_IPT_INDEX,

	TCA_IPT_CNT,

	TCA_IPT_TM,

	TCA_IPT_TARG,

	TCA_IPT_PAD,

	__TCA_IPT_MAX

};

#define TCA_IPT_MAX (__TCA_IPT_MAX - 1)

                                                                                

#endif

net/sched/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ obj-$(CONFIG_NET_ACT_POLICE) += act_police.o 
obj-$(CONFIG_NET_ACT_GACT)	+= act_gact.o

obj-$(CONFIG_NET_ACT_MIRRED)	+= act_mirred.o

obj-$(CONFIG_NET_ACT_SAMPLE)	+= act_sample.o

obj-$(CONFIG_NET_ACT_IPT)	+= act_ipt.o

obj-$(CONFIG_NET_ACT_NAT)	+= act_nat.o

obj-$(CONFIG_NET_ACT_PEDIT)	+= act_pedit.o

obj-$(CONFIG_NET_ACT_SIMP)	+= act_simple.o