From 1acd8a01ac028a145481f77eea9e2a12f37848da Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 26 Sep 2006 22:14:15 -0700 Subject: [PATCH] --- yaml --- r: 36775 b: refs/heads/master c: b83738ae003dde613712ddb1e90a8a01f5587b51 h: refs/heads/master i: 36773: 378fea9946c7936a5bbf46ea9fd99235e62486e6 36771: e2665dca383136e4b557ea7983d3dc5b10478867 36767: 48169ce0997bac0d9d2f90d606d65cf556b44472 v: v3 --- [refs] | 2 +- trunk/include/net/ip_fib.h | 4 ++-- trunk/net/ipv4/fib_semantics.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1f857518e72c..1a09a228077f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed49e3caaa6126f8e29f08e8b4fdcafcae431b57 +refs/heads/master: b83738ae003dde613712ddb1e90a8a01f5587b51 diff --git a/trunk/include/net/ip_fib.h b/trunk/include/net/ip_fib.h index 9f84e9fc1b1f..ece746ff4ef8 100644 --- a/trunk/include/net/ip_fib.h +++ b/trunk/include/net/ip_fib.h @@ -78,7 +78,7 @@ struct fib_info { int fib_dead; unsigned fib_flags; int fib_protocol; - u32 fib_prefsrc; + __be32 fib_prefsrc; u32 fib_priority; u32 fib_metrics[RTAX_MAX]; #define fib_mtu fib_metrics[RTAX_MTU-1] @@ -232,7 +232,7 @@ struct rtentry; extern int ip_fib_check_default(u32 gw, struct net_device *dev); extern int fib_sync_down(u32 local, struct net_device *dev, int force); extern int fib_sync_up(struct net_device *dev); -extern u32 __fib_res_prefsrc(struct fib_result *res); +extern __be32 __fib_res_prefsrc(struct fib_result *res); /* Exported by fib_hash.c */ extern struct fib_table *fib_hash_init(u32 id); diff --git a/trunk/net/ipv4/fib_semantics.c b/trunk/net/ipv4/fib_semantics.c index 2ead09543f68..152d9a264fab 100644 --- a/trunk/net/ipv4/fib_semantics.c +++ b/trunk/net/ipv4/fib_semantics.c @@ -923,7 +923,7 @@ int fib_semantic_match(struct list_head *head, const struct flowi *flp, /* Find appropriate source address to this destination */ -u32 __fib_res_prefsrc(struct fib_result *res) +__be32 __fib_res_prefsrc(struct fib_result *res) { return inet_select_addr(FIB_RES_DEV(*res), FIB_RES_GW(*res), res->scope); }