Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cd1837b authored by Jan Engelhardt's avatar Jan Engelhardt
Browse files

netfilter: xtables: remove xt_TOS v0 



Superseded by xt_TOS v1 (v2.6.24-2396-g5c350e5).

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent bbd8a0d3

Documentation/feature-removal-schedule.txt

+0 −3
Original line number Diff line number Diff line
@@ -235,9 +235,6 @@ Who: Thomas Gleixner <tglx@linutronix.de> 
---------------------------



What (Why):

	- include/linux/netfilter_ipv4/ipt_TOS.h ipt_tos.h header files

	  (superseded by xt_TOS/xt_tos target & match)



	- "forwarding" header files like ipt_mac.h in

	  include/linux/netfilter_ipv4/ and include/linux/netfilter_ipv6/

include/linux/netfilter_ipv4/Kbuild

+0 −2
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ header-y += ipt_NFQUEUE.h 
header-y += ipt_REJECT.h

header-y += ipt_SAME.h

header-y += ipt_TCPMSS.h

header-y += ipt_TOS.h

header-y += ipt_TTL.h

header-y += ipt_ULOG.h

header-y += ipt_addrtype.h
@@ -40,7 +39,6 @@ header-y += ipt_sctp.h 
header-y += ipt_state.h

header-y += ipt_string.h

header-y += ipt_tcpmss.h

header-y += ipt_tos.h

header-y += ipt_ttl.h



unifdef-y += ip_queue.h

include/linux/netfilter_ipv4/ipt_TOS.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
#ifndef _IPT_TOS_H_target

#define _IPT_TOS_H_target



#ifndef IPTOS_NORMALSVC

#define IPTOS_NORMALSVC 0

#endif



struct ipt_tos_target_info {

	u_int8_t tos;

};



#endif /*_IPT_TOS_H_target*/

include/linux/netfilter_ipv4/ipt_tos.h

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
#ifndef _IPT_TOS_H

#define _IPT_TOS_H



struct ipt_tos_info {

    u_int8_t tos;

    u_int8_t invert;

};



#ifndef IPTOS_NORMALSVC

#define IPTOS_NORMALSVC 0

#endif



#endif /*_IPT_TOS_H*/

net/netfilter/xt_DSCP.c

+0 −46
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include <linux/netfilter/x_tables.h>

#include <linux/netfilter/xt_DSCP.h>

#include <linux/netfilter_ipv4/ipt_TOS.h>



MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");

MODULE_DESCRIPTION("Xtables: DSCP/TOS field modification");
@@ -72,41 +71,6 @@ static bool dscp_tg_check(const struct xt_tgchk_param *par) 
	return true;

}



static unsigned int

tos_tg_v0(struct sk_buff *skb, const struct xt_target_param *par)

{

	const struct ipt_tos_target_info *info = par->targinfo;

	struct iphdr *iph = ip_hdr(skb);

	u_int8_t oldtos;



	if ((iph->tos & IPTOS_TOS_MASK) != info->tos) {

		if (!skb_make_writable(skb, sizeof(struct iphdr)))

			return NF_DROP;



		iph      = ip_hdr(skb);

		oldtos   = iph->tos;

		iph->tos = (iph->tos & IPTOS_PREC_MASK) | info->tos;

		csum_replace2(&iph->check, htons(oldtos), htons(iph->tos));

	}



	return XT_CONTINUE;

}



static bool tos_tg_check_v0(const struct xt_tgchk_param *par)

{

	const struct ipt_tos_target_info *info = par->targinfo;

	const uint8_t tos = info->tos;



	if (tos != IPTOS_LOWDELAY && tos != IPTOS_THROUGHPUT &&

	    tos != IPTOS_RELIABILITY && tos != IPTOS_MINCOST &&

	    tos != IPTOS_NORMALSVC) {

		printk(KERN_WARNING "TOS: bad tos value %#x\n", tos);

		return false;

	}



	return true;

}



static unsigned int

tos_tg(struct sk_buff *skb, const struct xt_target_param *par)

{
@@ -166,16 +130,6 @@ static struct xt_target dscp_tg_reg[] __read_mostly = { 
		.table		= "mangle",

		.me		= THIS_MODULE,

	},

	{

		.name		= "TOS",

		.revision	= 0,

		.family		= NFPROTO_IPV4,

		.table		= "mangle",

		.target		= tos_tg_v0,

		.targetsize	= sizeof(struct ipt_tos_target_info),

		.checkentry	= tos_tg_check_v0,

		.me		= THIS_MODULE,

	},

	{

		.name		= "TOS",

		.revision	= 1,