diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-16 05:23:45 -0500 |
| commit | c4de673b775e4db48cd2db6277e0c6714332ca0c (patch) | |
| tree | 84f9e4728e6ccf257236d2ba063b6e784ec8b65d /net/ipv4/fib_lookup.h | |
| parent | bafdc614a1f4f8be8cde41b8ab10ac17e67c1837 (diff) | |
| parent | 55957fb7a0b61d8ab6ff3f04e279b8fc22b738fa (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'net/ipv4/fib_lookup.h')
| -rw-r--r-- | net/ipv4/fib_lookup.h | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/net/ipv4/fib_lookup.h b/net/ipv4/fib_lookup.h index af0f14aba169..388d113fd289 100644 --- a/net/ipv4/fib_lookup.h +++ b/net/ipv4/fib_lookup.h | |||
| @@ -24,21 +24,17 @@ static inline void fib_alias_accessed(struct fib_alias *fa) | |||
| 24 | } | 24 | } |
| 25 | 25 | ||
| 26 | /* Exported by fib_semantics.c */ | 26 | /* Exported by fib_semantics.c */ |
| 27 | extern void fib_release_info(struct fib_info *); | 27 | void fib_release_info(struct fib_info *); |
| 28 | extern struct fib_info *fib_create_info(struct fib_config *cfg); | 28 | struct fib_info *fib_create_info(struct fib_config *cfg); |
| 29 | extern int fib_nh_match(struct fib_config *cfg, struct fib_info *fi); | 29 | int fib_nh_match(struct fib_config *cfg, struct fib_info *fi); |
| 30 | extern int fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event, | 30 | int fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event, u32 tb_id, |
| 31 | u32 tb_id, u8 type, __be32 dst, | 31 | u8 type, __be32 dst, int dst_len, u8 tos, struct fib_info *fi, |
| 32 | int dst_len, u8 tos, struct fib_info *fi, | 32 | unsigned int); |
| 33 | unsigned int); | 33 | void rtmsg_fib(int event, __be32 key, struct fib_alias *fa, int dst_len, |
| 34 | extern void rtmsg_fib(int event, __be32 key, struct fib_alias *fa, | 34 | u32 tb_id, const struct nl_info *info, unsigned int nlm_flags); |
| 35 | int dst_len, u32 tb_id, struct nl_info *info, | 35 | struct fib_alias *fib_find_alias(struct list_head *fah, u8 tos, u32 prio); |
| 36 | unsigned int nlm_flags); | 36 | int fib_detect_death(struct fib_info *fi, int order, |
| 37 | extern struct fib_alias *fib_find_alias(struct list_head *fah, | 37 | struct fib_info **last_resort, int *last_idx, int dflt); |
| 38 | u8 tos, u32 prio); | ||
| 39 | extern int fib_detect_death(struct fib_info *fi, int order, | ||
| 40 | struct fib_info **last_resort, | ||
| 41 | int *last_idx, int dflt); | ||
| 42 | 38 | ||
| 43 | static inline void fib_result_assign(struct fib_result *res, | 39 | static inline void fib_result_assign(struct fib_result *res, |
| 44 | struct fib_info *fi) | 40 | struct fib_info *fi) |