projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear...
[firefly-linux-kernel-4.4.55.git]
/
include
/
net
/
ip6_fib.h
diff --git
a/include/net/ip6_fib.h
b/include/net/ip6_fib.h
index bc3cde0a810c998b91017350c50c6131055fc9a0..477ef75f3873902243cc251a2da1421c1b79839b 100644
(file)
--- a/
include/net/ip6_fib.h
+++ b/
include/net/ip6_fib.h
@@
-13,8
+13,6
@@
#ifndef _IP6_FIB_H
#define _IP6_FIB_H
#ifndef _IP6_FIB_H
#define _IP6_FIB_H
-#ifdef __KERNEL__
-
#include <linux/ipv6_route.h>
#include <linux/rtnetlink.h>
#include <linux/spinlock.h>
#include <linux/ipv6_route.h>
#include <linux/rtnetlink.h>
#include <linux/spinlock.h>
@@
-42,6
+40,7
@@
struct fib6_config {
struct in6_addr fc_dst;
struct in6_addr fc_src;
struct in6_addr fc_dst;
struct in6_addr fc_src;
+ struct in6_addr fc_prefsrc;
struct in6_addr fc_gateway;
unsigned long fc_expires;
struct in6_addr fc_gateway;
unsigned long fc_expires;
@@
-107,6
+106,7
@@
struct rt6_info {
struct rt6key rt6i_dst ____cacheline_aligned_in_smp;
u32 rt6i_flags;
struct rt6key rt6i_src;
struct rt6key rt6i_dst ____cacheline_aligned_in_smp;
u32 rt6i_flags;
struct rt6key rt6i_src;
+ struct rt6key rt6i_prefsrc;
u32 rt6i_metric;
u32 rt6i_peer_genid;
u32 rt6i_metric;
u32 rt6i_peer_genid;
@@
-196,12
+196,12
@@
extern struct dst_entry *fib6_rule_lookup(struct net *net,
pol_lookup_t lookup);
extern struct fib6_node *fib6_lookup(struct fib6_node *root,
pol_lookup_t lookup);
extern struct fib6_node *fib6_lookup(struct fib6_node *root,
- struct in6_addr *daddr,
- struct in6_addr *saddr);
+
const
struct in6_addr *daddr,
+
const
struct in6_addr *saddr);
struct fib6_node *fib6_locate(struct fib6_node *root,
struct fib6_node *fib6_locate(struct fib6_node *root,
- struct in6_addr *daddr, int dst_len,
- struct in6_addr *saddr, int src_len);
+
const
struct in6_addr *daddr, int dst_len,
+
const
struct in6_addr *saddr, int src_len);
extern void fib6_clean_all(struct net *net,
int (*func)(struct rt6_info *, void *arg),
extern void fib6_clean_all(struct net *net,
int (*func)(struct rt6_info *, void *arg),
@@
-238,4
+238,3
@@
static inline void fib6_rules_cleanup(void)
}
#endif
#endif
}
#endif
#endif
-#endif