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 branch 'allocator' of git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs...
[firefly-linux-kernel-4.4.55.git]
/
include
/
net
/
route.h
diff --git
a/include/net/route.h
b/include/net/route.h
index 30d6cae3841af7ef73ffe09f3c6895c1b4cdb6db..8fce0621cad10a3e11a6a06dfa272f6583e65cd9 100644
(file)
--- a/
include/net/route.h
+++ b/
include/net/route.h
@@
-64,6
+64,7
@@
struct rtable {
__be32 rt_dst; /* Path destination */
__be32 rt_src; /* Path source */
__be32 rt_dst; /* Path destination */
__be32 rt_src; /* Path source */
+ int rt_route_iif;
int rt_iif;
int rt_oif;
__u32 rt_mark;
int rt_iif;
int rt_oif;
__u32 rt_mark;
@@
-80,12
+81,12
@@
struct rtable {
static inline bool rt_is_input_route(struct rtable *rt)
{
static inline bool rt_is_input_route(struct rtable *rt)
{
- return rt->rt_iif != 0;
+ return rt->rt_
route_
iif != 0;
}
static inline bool rt_is_output_route(struct rtable *rt)
{
}
static inline bool rt_is_output_route(struct rtable *rt)
{
- return rt->rt_iif == 0;
+ return rt->rt_
route_
iif == 0;
}
struct ip_rt_acct {
}
struct ip_rt_acct {
@@
-207,6
+208,7
@@
extern int ip_rt_dump(struct sk_buff *skb, struct netlink_callback *cb);
struct in_ifaddr;
extern void fib_add_ifaddr(struct in_ifaddr *);
struct in_ifaddr;
extern void fib_add_ifaddr(struct in_ifaddr *);
+extern void fib_del_ifaddr(struct in_ifaddr *, struct in_ifaddr *);
static inline void ip_rt_put(struct rtable * rt)
{
static inline void ip_rt_put(struct rtable * rt)
{
@@
-269,8
+271,8
@@
static inline struct rtable *ip_route_newports(struct rtable *rt,
struct flowi4 fl4 = {
.flowi4_oif = rt->rt_oif,
.flowi4_mark = rt->rt_mark,
struct flowi4 fl4 = {
.flowi4_oif = rt->rt_oif,
.flowi4_mark = rt->rt_mark,
- .daddr = rt->rt_
key_
dst,
- .saddr = rt->rt_
key_
src,
+ .daddr = rt->rt_dst,
+ .saddr = rt->rt_src,
.flowi4_tos = rt->rt_tos,
.flowi4_proto = protocol,
.fl4_sport = sport,
.flowi4_tos = rt->rt_tos,
.flowi4_proto = protocol,
.fl4_sport = sport,