Skip to content

Commit ba24ea1

Browse files
jhsmtdavem330
authored andcommitted
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: Victor Noguiera <[email protected]> Reviewed-by: Pedro Tammela <[email protected]> Signed-off-by: Jamal Hadi Salim <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 993498e commit ba24ea1

File tree

8 files changed

+2
-510
lines changed

8 files changed

+2
-510
lines changed

include/net/tc_act/tc_ipt.h

Lines changed: 0 additions & 17 deletions
This file was deleted.

include/net/tc_wrapper.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ static inline int tc_act(struct sk_buff *skb, const struct tc_action *a,
117117
if (a->ops->act == tcf_ife_act)
118118
return tcf_ife_act(skb, a, res);
119119
#endif
120-
#if IS_BUILTIN(CONFIG_NET_ACT_IPT)
121-
if (a->ops->act == tcf_ipt_act)
122-
return tcf_ipt_act(skb, a, res);
123-
#endif
124120
#if IS_BUILTIN(CONFIG_NET_ACT_SIMP)
125121
if (a->ops->act == tcf_simp_act)
126122
return tcf_simp_act(skb, a, res);

include/uapi/linux/pkt_cls.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ enum {
9999
* versions.
100100
*/
101101
#define TCA_ACT_GACT 5
102-
#define TCA_ACT_IPT 6
102+
#define TCA_ACT_IPT 6 /* obsoleted, can be reused */
103103
#define TCA_ACT_PEDIT 7
104104
#define TCA_ACT_MIRRED 8
105105
#define TCA_ACT_NAT 9
@@ -120,7 +120,7 @@ enum tca_id {
120120
TCA_ID_UNSPEC = 0,
121121
TCA_ID_POLICE = 1,
122122
TCA_ID_GACT = TCA_ACT_GACT,
123-
TCA_ID_IPT = TCA_ACT_IPT,
123+
TCA_ID_IPT = TCA_ACT_IPT, /* Obsoleted, can be reused */
124124
TCA_ID_PEDIT = TCA_ACT_PEDIT,
125125
TCA_ID_MIRRED = TCA_ACT_MIRRED,
126126
TCA_ID_NAT = TCA_ACT_NAT,

include/uapi/linux/tc_act/tc_ipt.h

Lines changed: 0 additions & 20 deletions
This file was deleted.

net/sched/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ obj-$(CONFIG_NET_ACT_POLICE) += act_police.o
1313
obj-$(CONFIG_NET_ACT_GACT) += act_gact.o
1414
obj-$(CONFIG_NET_ACT_MIRRED) += act_mirred.o
1515
obj-$(CONFIG_NET_ACT_SAMPLE) += act_sample.o
16-
obj-$(CONFIG_NET_ACT_IPT) += act_ipt.o
1716
obj-$(CONFIG_NET_ACT_NAT) += act_nat.o
1817
obj-$(CONFIG_NET_ACT_PEDIT) += act_pedit.o
1918
obj-$(CONFIG_NET_ACT_SIMP) += act_simple.o

0 commit comments

Comments
 (0)