aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/route.h4
-rw-r--r--net/ipv4/route.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/include/net/route.h b/include/net/route.h
index 9cfa67089f7f..64a18811526d 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -109,8 +109,8 @@ extern struct ip_rt_acct *ip_rt_acct;
109 109
110struct in_device; 110struct in_device;
111extern int ip_rt_init(void); 111extern int ip_rt_init(void);
112extern void ip_rt_redirect(u32 old_gw, u32 dst, u32 new_gw, 112extern void ip_rt_redirect(__be32 old_gw, __be32 dst, __be32 new_gw,
113 u32 src, struct net_device *dev); 113 __be32 src, struct net_device *dev);
114extern void ip_rt_advice(struct rtable **rp, int advice); 114extern void ip_rt_advice(struct rtable **rp, int advice);
115extern void rt_cache_flush(int how); 115extern void rt_cache_flush(int how);
116extern int __ip_route_output_key(struct rtable **, const struct flowi *flp); 116extern int __ip_route_output_key(struct rtable **, const struct flowi *flp);
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index bbe529774fd9..e14df8ec5082 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1118,13 +1118,13 @@ static void rt_del(unsigned hash, struct rtable *rt)
1118 spin_unlock_bh(rt_hash_lock_addr(hash)); 1118 spin_unlock_bh(rt_hash_lock_addr(hash));
1119} 1119}
1120 1120
1121void ip_rt_redirect(u32 old_gw, u32 daddr, u32 new_gw, 1121void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw,
1122 u32 saddr, struct net_device *dev) 1122 __be32 saddr, struct net_device *dev)
1123{ 1123{
1124 int i, k; 1124 int i, k;
1125 struct in_device *in_dev = in_dev_get(dev); 1125 struct in_device *in_dev = in_dev_get(dev);
1126 struct rtable *rth, **rthp; 1126 struct rtable *rth, **rthp;
1127 u32 skeys[2] = { saddr, 0 }; 1127 __be32 skeys[2] = { saddr, 0 };
1128 int ikeys[2] = { dev->ifindex, 0 }; 1128 int ikeys[2] = { dev->ifindex, 0 };
1129 struct netevent_redirect netevent; 1129 struct netevent_redirect netevent;
1130 1130