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
/
ipv4
/
ipmr.c
diff --git
a/kernel/net/ipv4/ipmr.c
b/kernel/net/ipv4/ipmr.c
index
c3a3835
..
8e77786
100644
(file)
--- a/
kernel/net/ipv4/ipmr.c
+++ b/
kernel/net/ipv4/ipmr.c
@@
-882,8
+882,10
@@
static struct mfc_cache *ipmr_cache_alloc(void)
{
struct mfc_cache *c = kmem_cache_zalloc(mrt_cachep, GFP_KERNEL);
{
struct mfc_cache *c = kmem_cache_zalloc(mrt_cachep, GFP_KERNEL);
- if (c)
+ if (c) {
+ c->mfc_un.res.last_assert = jiffies - MFC_ASSERT_THRESH - 1;
c->mfc_un.res.minvif = MAXVIFS;
c->mfc_un.res.minvif = MAXVIFS;
+ }
return c;
}
return c;
}
@@
-2190,7
+2192,7
@@
static int __ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb,
int ipmr_get_route(struct net *net, struct sk_buff *skb,
__be32 saddr, __be32 daddr,
int ipmr_get_route(struct net *net, struct sk_buff *skb,
__be32 saddr, __be32 daddr,
- struct rtmsg *rtm, int nowait)
+ struct rtmsg *rtm, int nowait
, u32 portid
)
{
struct mfc_cache *cache;
struct mr_table *mrt;
{
struct mfc_cache *cache;
struct mr_table *mrt;
@@
-2235,6
+2237,7
@@
int ipmr_get_route(struct net *net, struct sk_buff *skb,
return -ENOMEM;
}
return -ENOMEM;
}
+ NETLINK_CB(skb2).portid = portid;
skb_push(skb2, sizeof(struct iphdr));
skb_reset_network_header(skb2);
iph = ip_hdr(skb2);
skb_push(skb2, sizeof(struct iphdr));
skb_reset_network_header(skb2);
iph = ip_hdr(skb2);