From 013aec6ce8015d069716fac4729c318f34654122 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 26 Sep 2006 21:25:43 -0700 Subject: [PATCH] --- yaml --- r: 36765 b: refs/heads/master c: f7655229c06d041323b40bd6eb9f95ca0ce95506 h: refs/heads/master i: 36763: b5fa655a9c4a44901296f7371923d2a7d472119e v: v3 --- [refs] | 2 +- trunk/include/net/route.h | 4 ++-- trunk/net/ipv4/route.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index eaddeacacd71..1f4d30d683bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e12bb22e32389b41222c9d9fb55724fed83a038 +refs/heads/master: f7655229c06d041323b40bd6eb9f95ca0ce95506 diff --git a/trunk/include/net/route.h b/trunk/include/net/route.h index 9cfa67089f7f..64a18811526d 100644 --- a/trunk/include/net/route.h +++ b/trunk/include/net/route.h @@ -109,8 +109,8 @@ extern struct ip_rt_acct *ip_rt_acct; struct in_device; extern int ip_rt_init(void); -extern void ip_rt_redirect(u32 old_gw, u32 dst, u32 new_gw, - u32 src, struct net_device *dev); +extern void ip_rt_redirect(__be32 old_gw, __be32 dst, __be32 new_gw, + __be32 src, struct net_device *dev); extern void ip_rt_advice(struct rtable **rp, int advice); extern void rt_cache_flush(int how); extern int __ip_route_output_key(struct rtable **, const struct flowi *flp); diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index bbe529774fd9..e14df8ec5082 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -1118,13 +1118,13 @@ static void rt_del(unsigned hash, struct rtable *rt) spin_unlock_bh(rt_hash_lock_addr(hash)); } -void ip_rt_redirect(u32 old_gw, u32 daddr, u32 new_gw, - u32 saddr, struct net_device *dev) +void ip_rt_redirect(__be32 old_gw, __be32 daddr, __be32 new_gw, + __be32 saddr, struct net_device *dev) { int i, k; struct in_device *in_dev = in_dev_get(dev); struct rtable *rth, **rthp; - u32 skeys[2] = { saddr, 0 }; + __be32 skeys[2] = { saddr, 0 }; int ikeys[2] = { dev->ifindex, 0 }; struct netevent_redirect netevent;