Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
net
/
ipv6
/
ip6mr.c
diff --git
a/kernel/net/ipv6/ip6mr.c
b/kernel/net/ipv6/ip6mr.c
index
a10e771
..
d9843e5
100644
(file)
--- a/
kernel/net/ipv6/ip6mr.c
+++ b/
kernel/net/ipv6/ip6mr.c
@@
-1074,6
+1074,7
@@
static struct mfc6_cache *ip6mr_cache_alloc(void)
struct mfc6_cache *c = kmem_cache_zalloc(mrt_cachep, GFP_KERNEL);
if (!c)
return NULL;
struct mfc6_cache *c = kmem_cache_zalloc(mrt_cachep, GFP_KERNEL);
if (!c)
return NULL;
+ c->mfc_un.res.last_assert = jiffies - MFC_ASSERT_THRESH - 1;
c->mfc_un.res.minvif = MAXMIFS;
return c;
}
c->mfc_un.res.minvif = MAXMIFS;
return c;
}
@@
-2275,8
+2276,8
@@
static int __ip6mr_fill_mroute(struct mr6_table *mrt, struct sk_buff *skb,
return 1;
}
return 1;
}
-int ip6mr_get_route(struct net *net,
-
struct sk_buff *skb, struct rtmsg *rtm, int nowait
)
+int ip6mr_get_route(struct net *net,
struct sk_buff *skb, struct rtmsg *rtm,
+
int nowait, u32 portid
)
{
int err;
struct mr6_table *mrt;
{
int err;
struct mr6_table *mrt;
@@
-2321,6
+2322,7
@@
int ip6mr_get_route(struct net *net,
return -ENOMEM;
}
return -ENOMEM;
}
+ NETLINK_CB(skb2).portid = portid;
skb_reset_transport_header(skb2);
skb_put(skb2, sizeof(struct ipv6hdr));
skb_reset_transport_header(skb2);
skb_put(skb2, sizeof(struct ipv6hdr));