diff options
-rw-r--r-- | include/net/ip_fib.h | 4 | ||||
-rw-r--r-- | net/ipv4/fib_frontend.c | 4 | ||||
-rw-r--r-- | net/ipv4/route.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index fcc159a4ac17..c4eca2575b84 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h | |||
@@ -222,8 +222,8 @@ extern int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *ar | |||
222 | extern int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg); | 222 | extern int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg); |
223 | extern int inet_rtm_getroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg); | 223 | extern int inet_rtm_getroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg); |
224 | extern int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb); | 224 | extern int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb); |
225 | extern int fib_validate_source(u32 src, u32 dst, u8 tos, int oif, | 225 | extern int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif, |
226 | struct net_device *dev, u32 *spec_dst, u32 *itag); | 226 | struct net_device *dev, __be32 *spec_dst, u32 *itag); |
227 | extern void fib_select_multipath(const struct flowi *flp, struct fib_result *res); | 227 | extern void fib_select_multipath(const struct flowi *flp, struct fib_result *res); |
228 | 228 | ||
229 | struct rtentry; | 229 | struct rtentry; |
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index cfb527c060e4..684b91f7c2ae 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c | |||
@@ -180,8 +180,8 @@ unsigned inet_addr_type(u32 addr) | |||
180 | - check, that packet arrived from expected physical interface. | 180 | - check, that packet arrived from expected physical interface. |
181 | */ | 181 | */ |
182 | 182 | ||
183 | int fib_validate_source(u32 src, u32 dst, u8 tos, int oif, | 183 | int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif, |
184 | struct net_device *dev, u32 *spec_dst, u32 *itag) | 184 | struct net_device *dev, __be32 *spec_dst, u32 *itag) |
185 | { | 185 | { |
186 | struct in_device *in_dev; | 186 | struct in_device *in_dev; |
187 | struct flowi fl = { .nl_u = { .ip4_u = | 187 | struct flowi fl = { .nl_u = { .ip4_u = |
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 9d8fbf1e5bc3..4bb66fee4543 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -1722,7 +1722,8 @@ static inline int __mkroute_input(struct sk_buff *skb, | |||
1722 | int err; | 1722 | int err; |
1723 | struct in_device *out_dev; | 1723 | struct in_device *out_dev; |
1724 | unsigned flags = 0; | 1724 | unsigned flags = 0; |
1725 | u32 spec_dst, itag; | 1725 | __be32 spec_dst; |
1726 | u32 itag; | ||
1726 | 1727 | ||
1727 | /* get a working reference to the output device */ | 1728 | /* get a working reference to the output device */ |
1728 | out_dev = in_dev_get(FIB_RES_DEV(*res)); | 1729 | out_dev = in_dev_get(FIB_RES_DEV(*res)); |