Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 36775
b: refs/heads/master
c: b83738a
h: refs/heads/master
i:
  36773: 378fea9
  36771: e2665dc
  36767: 48169ce
v: v3
  • Loading branch information
Al Viro authored and David S. Miller committed Sep 29, 2006
1 parent 7648684 commit 1acd8a0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ed49e3caaa6126f8e29f08e8b4fdcafcae431b57
refs/heads/master: b83738ae003dde613712ddb1e90a8a01f5587b51
4 changes: 2 additions & 2 deletions trunk/include/net/ip_fib.h
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/net/ipv4/fib_semantics.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 1acd8a0

Please sign in to comment.