Commit c7c3e591 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: ipv4: remove fib_weight 



fib_weight in fib_info is set but not used. Remove it and the
helpers for setting it.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fadad670

include/net/ip_fib.h

+0 −3
Original line number Diff line number Diff line
@@ -122,9 +122,6 @@ struct fib_info { 
#define fib_rtt fib_metrics->metrics[RTAX_RTT-1]

#define fib_advmss fib_metrics->metrics[RTAX_ADVMSS-1]

	int			fib_nhs;

#ifdef CONFIG_IP_ROUTE_MULTIPATH

	int			fib_weight;

#endif

	struct rcu_head		rcu;

	struct fib_nh		fib_nh[0];

#define fib_dev		fib_nh[0].nh_dev

net/ipv4/fib_semantics.c

+0 −9
Original line number Diff line number Diff line
@@ -601,17 +601,9 @@ static void fib_rebalance(struct fib_info *fi) 
		atomic_set(&nexthop_nh->nh_upper_bound, upper_bound);

	} endfor_nexthops(fi);

}



static inline void fib_add_weight(struct fib_info *fi,

				  const struct fib_nh *nh)

{

	fi->fib_weight += nh->nh_weight;

}



#else /* CONFIG_IP_ROUTE_MULTIPATH */



#define fib_rebalance(fi) do { } while (0)

#define fib_add_weight(fi, nh) do { } while (0)



#endif /* CONFIG_IP_ROUTE_MULTIPATH */
@@ -1275,7 +1267,6 @@ struct fib_info *fib_create_info(struct fib_config *cfg, 


	change_nexthops(fi) {

		fib_info_update_nh_saddr(net, nexthop_nh);

		fib_add_weight(fi, nexthop_nh);

	} endfor_nexthops(fi)



	fib_rebalance(fi);