aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/route.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/route.c')
-rw-r--r--net/ipv4/route.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index a13ce2364ed2..ac4d6b3fa9c9 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -296,7 +296,7 @@ static inline void rt_hash_lock_init(void)
296#endif 296#endif
297 297
298static struct rt_hash_bucket *rt_hash_table __read_mostly; 298static struct rt_hash_bucket *rt_hash_table __read_mostly;
299static unsigned rt_hash_mask __read_mostly; 299static unsigned int rt_hash_mask __read_mostly;
300static unsigned int rt_hash_log __read_mostly; 300static unsigned int rt_hash_log __read_mostly;
301 301
302static DEFINE_PER_CPU(struct rt_cache_stat, rt_cache_stat); 302static DEFINE_PER_CPU(struct rt_cache_stat, rt_cache_stat);
@@ -1143,7 +1143,7 @@ static int rt_bind_neighbour(struct rtable *rt)
1143 return 0; 1143 return 0;
1144} 1144}
1145 1145
1146static struct rtable *rt_intern_hash(unsigned hash, struct rtable *rt, 1146static struct rtable *rt_intern_hash(unsigned int hash, struct rtable *rt,
1147 struct sk_buff *skb, int ifindex) 1147 struct sk_buff *skb, int ifindex)
1148{ 1148{
1149 struct rtable *rth, *cand; 1149 struct rtable *rth, *cand;
@@ -1384,7 +1384,7 @@ void __ip_select_ident(struct iphdr *iph, struct dst_entry *dst, int more)
1384} 1384}
1385EXPORT_SYMBOL(__ip_select_ident); 1385EXPORT_SYMBOL(__ip_select_ident);
1386 1386
1387static void rt_del(unsigned hash, struct rtable *rt) 1387static void rt_del(unsigned int hash, struct rtable *rt)
1388{ 1388{
1389 struct rtable __rcu **rthp; 1389 struct rtable __rcu **rthp;
1390 struct rtable *aux; 1390 struct rtable *aux;
@@ -1538,7 +1538,7 @@ static struct dst_entry *ipv4_negative_advice(struct dst_entry *dst)
1538 ip_rt_put(rt); 1538 ip_rt_put(rt);
1539 ret = NULL; 1539 ret = NULL;
1540 } else if (rt->rt_flags & RTCF_REDIRECTED) { 1540 } else if (rt->rt_flags & RTCF_REDIRECTED) {
1541 unsigned hash = rt_hash(rt->rt_key_dst, rt->rt_key_src, 1541 unsigned int hash = rt_hash(rt->rt_key_dst, rt->rt_key_src,
1542 rt->rt_oif, 1542 rt->rt_oif,
1543 rt_genid(dev_net(dst->dev))); 1543 rt_genid(dev_net(dst->dev)));
1544 rt_del(hash, rt); 1544 rt_del(hash, rt);
@@ -2217,7 +2217,7 @@ static int ip_mkroute_input(struct sk_buff *skb,
2217{ 2217{
2218 struct rtable *rth = NULL; 2218 struct rtable *rth = NULL;
2219 int err; 2219 int err;
2220 unsigned hash; 2220 unsigned int hash;
2221 2221
2222#ifdef CONFIG_IP_ROUTE_MULTIPATH 2222#ifdef CONFIG_IP_ROUTE_MULTIPATH
2223 if (res->fi && res->fi->fib_nhs > 1) 2223 if (res->fi && res->fi->fib_nhs > 1)
@@ -2255,10 +2255,10 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
2255 struct fib_result res; 2255 struct fib_result res;
2256 struct in_device *in_dev = __in_dev_get_rcu(dev); 2256 struct in_device *in_dev = __in_dev_get_rcu(dev);
2257 struct flowi4 fl4; 2257 struct flowi4 fl4;
2258 unsigned flags = 0; 2258 unsigned int flags = 0;
2259 u32 itag = 0; 2259 u32 itag = 0;
2260 struct rtable *rth; 2260 struct rtable *rth;
2261 unsigned hash; 2261 unsigned int hash;
2262 __be32 spec_dst; 2262 __be32 spec_dst;
2263 int err = -EINVAL; 2263 int err = -EINVAL;
2264 struct net *net = dev_net(dev); 2264 struct net *net = dev_net(dev);
@@ -2433,8 +2433,8 @@ martian_source_keep_err:
2433int ip_route_input_common(struct sk_buff *skb, __be32 daddr, __be32 saddr, 2433int ip_route_input_common(struct sk_buff *skb, __be32 daddr, __be32 saddr,
2434 u8 tos, struct net_device *dev, bool noref) 2434 u8 tos, struct net_device *dev, bool noref)
2435{ 2435{
2436 struct rtable *rth; 2436 struct rtable *rth;
2437 unsigned hash; 2437 unsigned int hash;
2438 int iif = dev->ifindex; 2438 int iif = dev->ifindex;
2439 struct net *net; 2439 struct net *net;
2440 int res; 2440 int res;