Commit af13b3c3 authored by David Laight's avatar David Laight Committed by David S. Miller
Browse files

Remove DST_HOST 



Previous changes to the IP routing code have removed all the
tests for the DS_HOST route flag.
Remove the flags and all the code that sets it.

Signed-off-by: default avatarDavid Laight <david.laight@aculab.com>
Acked-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 723d5e5b

drivers/net/vrf.c

+2 −2
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ static void vrf_rt6_release(struct net_device *dev, struct net_vrf *vrf) 


static int vrf_rt6_create(struct net_device *dev)

{

	int flags = DST_HOST | DST_NOPOLICY | DST_NOXFRM;

	int flags = DST_NOPOLICY | DST_NOXFRM;

	struct net_vrf *vrf = netdev_priv(dev);

	struct net *net = dev_net(dev);

	struct rt6_info *rt6;
@@ -739,7 +739,7 @@ static int vrf_rtable_create(struct net_device *dev) 
		return -ENOMEM;



	/* create a dst for routing packets out through a VRF device */

	rth = rt_dst_alloc(dev, 0, RTN_UNICAST, 1, 1, 0);

	rth = rt_dst_alloc(dev, 0, RTN_UNICAST, 1, 1);

	if (!rth)

		return -ENOMEM;

include/net/dst.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ struct dst_entry { 
	int			(*output)(struct net *net, struct sock *sk, struct sk_buff *skb);



	unsigned short		flags;

#define DST_HOST		0x0001

#define DST_NOXFRM		0x0002

#define DST_NOPOLICY		0x0004

#define DST_NOCOUNT		0x0008

include/net/ip6_fib.h

+1 −2
Original line number Diff line number Diff line
@@ -190,11 +190,10 @@ struct fib6_info { 
	u8				should_flush:1,

					dst_nocount:1,

					dst_nopolicy:1,

					dst_host:1,

					fib6_destroying:1,

					offload:1,

					trap:1,

					unused:1;

					unused:2;



	struct rcu_head			rcu;

	struct nexthop			*nh;

include/net/route.h

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ int ip_rt_ioctl(struct net *, unsigned int cmd, struct rtentry *rt); 
void ip_rt_get_source(u8 *src, struct sk_buff *skb, struct rtable *rt);

struct rtable *rt_dst_alloc(struct net_device *dev,

			     unsigned int flags, u16 type,

			     bool nopolicy, bool noxfrm, bool will_cache);

			     bool nopolicy, bool noxfrm);

struct rtable *rt_dst_clone(struct net_device *dev, struct rtable *rt);



struct in_ifaddr;

net/decnet/dn_route.c

+2 −2
Original line number Diff line number Diff line
@@ -1173,7 +1173,7 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowidn *o 
	if (dev_out->flags & IFF_LOOPBACK)

		flags |= RTCF_LOCAL;



	rt = dst_alloc(&dn_dst_ops, dev_out, 0, DST_OBSOLETE_NONE, DST_HOST);

	rt = dst_alloc(&dn_dst_ops, dev_out, 0, DST_OBSOLETE_NONE, 0);

	if (rt == NULL)

		goto e_nobufs;
@@ -1439,7 +1439,7 @@ static int dn_route_input_slow(struct sk_buff *skb) 
	}



make_route:

	rt = dst_alloc(&dn_dst_ops, out_dev, 1, DST_OBSOLETE_NONE, DST_HOST);

	rt = dst_alloc(&dn_dst_ops, out_dev, 1, DST_OBSOLETE_NONE, 0);

	if (rt == NULL)

		goto e_nobufs;