From e2665dca383136e4b557ea7983d3dc5b10478867 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 26 Sep 2006 21:28:14 -0700 Subject: [PATCH] --- yaml --- r: 36771 b: refs/heads/master c: d9c9df8c9368f4102324e8c3923edae83974602b h: refs/heads/master i: 36769: 605ffb48f00e6c43860a638845b7d5f0c640fcc4 36767: 48169ce0997bac0d9d2f90d606d65cf556b44472 v: v3 --- [refs] | 2 +- trunk/include/net/ip_fib.h | 4 ++-- trunk/net/ipv4/fib_frontend.c | 4 ++-- trunk/net/ipv4/route.c | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ee79290cf31e..0321f142de8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a61ced5d1c2e773620d7855ea2009d770c10a6e6 +refs/heads/master: d9c9df8c9368f4102324e8c3923edae83974602b diff --git a/trunk/include/net/ip_fib.h b/trunk/include/net/ip_fib.h index fcc159a4ac17..c4eca2575b84 100644 --- a/trunk/include/net/ip_fib.h +++ b/trunk/include/net/ip_fib.h @@ -222,8 +222,8 @@ extern int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *ar extern int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg); extern int inet_rtm_getroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg); extern int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb); -extern int fib_validate_source(u32 src, u32 dst, u8 tos, int oif, - struct net_device *dev, u32 *spec_dst, u32 *itag); +extern int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif, + struct net_device *dev, __be32 *spec_dst, u32 *itag); extern void fib_select_multipath(const struct flowi *flp, struct fib_result *res); struct rtentry; diff --git a/trunk/net/ipv4/fib_frontend.c b/trunk/net/ipv4/fib_frontend.c index cfb527c060e4..684b91f7c2ae 100644 --- a/trunk/net/ipv4/fib_frontend.c +++ b/trunk/net/ipv4/fib_frontend.c @@ -180,8 +180,8 @@ unsigned inet_addr_type(u32 addr) - check, that packet arrived from expected physical interface. */ -int fib_validate_source(u32 src, u32 dst, u8 tos, int oif, - struct net_device *dev, u32 *spec_dst, u32 *itag) +int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif, + struct net_device *dev, __be32 *spec_dst, u32 *itag) { struct in_device *in_dev; struct flowi fl = { .nl_u = { .ip4_u = diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index 9d8fbf1e5bc3..4bb66fee4543 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -1722,7 +1722,8 @@ static inline int __mkroute_input(struct sk_buff *skb, int err; struct in_device *out_dev; unsigned flags = 0; - u32 spec_dst, itag; + __be32 spec_dst; + u32 itag; /* get a working reference to the output device */ out_dev = in_dev_get(FIB_RES_DEV(*res));