Commit 475949d8 authored by David S. Miller's avatar David S. Miller
Browse files

ipv4: Renamt struct rtable's rt_tos to rt_key_tos. 



To more accurately reflect that it is purely a routing
cache lookup key and is used in no other context.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 417da66f

include/net/route.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct rtable { 
	int			rt_genid;

	unsigned		rt_flags;

	__u16			rt_type;

	__u8			rt_tos;

	__u8			rt_key_tos;



	__be32			rt_dst;	/* Path destination	*/

	__be32			rt_src;	/* Path source		*/

net/ipv4/route.c

+12 −12
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static int rt_cache_seq_show(struct seq_file *seq, void *v) 
			dst_metric(&r->dst, RTAX_WINDOW),

			(int)((dst_metric(&r->dst, RTAX_RTT) >> 3) +

			      dst_metric(&r->dst, RTAX_RTTVAR)),

			r->rt_tos,

			r->rt_key_tos,

			r->dst.hh ? atomic_read(&r->dst.hh->hh_refcnt) : -1,

			r->dst.hh ? (r->dst.hh->hh_output ==

				       dev_queue_xmit) : 0,
@@ -724,7 +724,7 @@ static inline int compare_keys(struct rtable *rt1, struct rtable *rt2) 
	return (((__force u32)rt1->rt_key_dst ^ (__force u32)rt2->rt_key_dst) |

		((__force u32)rt1->rt_key_src ^ (__force u32)rt2->rt_key_src) |

		(rt1->rt_mark ^ rt2->rt_mark) |

		(rt1->rt_tos ^ rt2->rt_tos) |

		(rt1->rt_key_tos ^ rt2->rt_key_tos) |

		(rt1->rt_oif ^ rt2->rt_oif) |

		(rt1->rt_iif ^ rt2->rt_iif)) == 0;

}
@@ -1349,7 +1349,7 @@ static struct dst_entry *ipv4_negative_advice(struct dst_entry *dst) 
						rt_genid(dev_net(dst->dev)));

#if RT_CACHE_DEBUG >= 1

			printk(KERN_DEBUG "ipv4_negative_advice: redirect to %pI4/%02x dropped\n",

				&rt->rt_dst, rt->rt_tos);

				&rt->rt_dst, rt->rt_key_tos);

#endif

			rt_del(hash, rt);

			ret = NULL;
@@ -1710,7 +1710,7 @@ void ip_rt_get_source(u8 *addr, struct rtable *rt) 
		struct flowi4 fl4 = {

			.daddr = rt->rt_key_dst,

			.saddr = rt->rt_key_src,

			.flowi4_tos = rt->rt_tos,

			.flowi4_tos = rt->rt_key_tos,

			.flowi4_oif = rt->rt_oif,

			.flowi4_iif = rt->rt_iif,

			.flowi4_mark = rt->rt_mark,
@@ -1886,7 +1886,7 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr, 
	rth->rt_genid	= rt_genid(dev_net(dev));

	rth->rt_flags	= RTCF_MULTICAST;

	rth->rt_type	= RTN_MULTICAST;

	rth->rt_tos	= tos;

	rth->rt_key_tos	= tos;

	rth->rt_dst	= daddr;

	rth->rt_src	= saddr;

	rth->rt_route_iif = dev->ifindex;
@@ -2023,7 +2023,7 @@ static int __mkroute_input(struct sk_buff *skb, 
	rth->rt_genid = rt_genid(dev_net(rth->dst.dev));

	rth->rt_flags = flags;

	rth->rt_type = res->type;

	rth->rt_tos	= tos;

	rth->rt_key_tos	= tos;

	rth->rt_dst	= daddr;

	rth->rt_src	= saddr;

	rth->rt_route_iif = in_dev->dev->ifindex;
@@ -2203,7 +2203,7 @@ out: return err; 
	rth->rt_genid = rt_genid(net);

	rth->rt_flags 	= flags|RTCF_LOCAL;

	rth->rt_type	= res.type;

	rth->rt_tos	= tos;

	rth->rt_key_tos	= tos;

	rth->rt_dst	= daddr;

	rth->rt_src	= saddr;

#ifdef CONFIG_IP_ROUTE_CLASSID
@@ -2293,7 +2293,7 @@ int ip_route_input_common(struct sk_buff *skb, __be32 daddr, __be32 saddr, 
		     ((__force u32)rth->rt_key_src ^ (__force u32)saddr) |

		     (rth->rt_iif ^ iif) |

		     rth->rt_oif |

		     (rth->rt_tos ^ tos)) == 0 &&

		     (rth->rt_key_tos ^ tos)) == 0 &&

		    rth->rt_mark == skb->mark &&

		    net_eq(dev_net(rth->dst.dev), net) &&

		    !rt_is_expired(rth)) {
@@ -2410,7 +2410,7 @@ static struct rtable *__mkroute_output(const struct fib_result *res, 
	rth->rt_genid = rt_genid(dev_net(dev_out));

	rth->rt_flags	= flags;

	rth->rt_type	= type;

	rth->rt_tos	= tos;

	rth->rt_key_tos	= tos;

	rth->rt_dst	= fl4->daddr;

	rth->rt_src	= fl4->saddr;

	rth->rt_route_iif = 0;
@@ -2668,7 +2668,7 @@ struct rtable *__ip_route_output_key(struct net *net, struct flowi4 *flp4) 
		    rt_is_output_route(rth) &&

		    rth->rt_oif == flp4->flowi4_oif &&

		    rth->rt_mark == flp4->flowi4_mark &&

		    !((rth->rt_tos ^ flp4->flowi4_tos) &

		    !((rth->rt_key_tos ^ flp4->flowi4_tos) &

			    (IPTOS_RT_MASK | RTO_ONLINK)) &&

		    net_eq(dev_net(rth->dst.dev), net) &&

		    !rt_is_expired(rth)) {
@@ -2740,7 +2740,7 @@ struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_or 


		rt->rt_key_dst = ort->rt_key_dst;

		rt->rt_key_src = ort->rt_key_src;

		rt->rt_tos = ort->rt_tos;

		rt->rt_key_tos = ort->rt_key_tos;

		rt->rt_route_iif = ort->rt_route_iif;

		rt->rt_iif = ort->rt_iif;

		rt->rt_oif = ort->rt_oif;
@@ -2803,7 +2803,7 @@ static int rt_fill_info(struct net *net, 
	r->rtm_family	 = AF_INET;

	r->rtm_dst_len	= 32;

	r->rtm_src_len	= 0;

	r->rtm_tos	= rt->rt_tos;

	r->rtm_tos	= rt->rt_key_tos;

	r->rtm_table	= RT_TABLE_MAIN;

	NLA_PUT_U32(skb, RTA_TABLE, RT_TABLE_MAIN);

	r->rtm_type	= rt->rt_type;

net/ipv4/xfrm4_policy.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, 


	rt->rt_key_dst = fl4->daddr;

	rt->rt_key_src = fl4->saddr;

	rt->rt_tos = fl4->flowi4_tos;

	rt->rt_key_tos = fl4->flowi4_tos;

	rt->rt_route_iif = fl4->flowi4_iif;

	rt->rt_iif = fl4->flowi4_iif;

	rt->rt_oif = fl4->flowi4_oif;