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
ipmr, ip6mr: fix scheduling while atomic and a deadlock with ipmr_get_route
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv4
/
route.c
diff --git
a/net/ipv4/route.c
b/net/ipv4/route.c
index b050cf980a57796cc285a4fd6927f0c0576f6272..8533a75a932869cc61add56b245b6343d9f4271e 100644
(file)
--- a/
net/ipv4/route.c
+++ b/
net/ipv4/route.c
@@
-2492,7
+2492,8
@@
static int rt_fill_info(struct net *net, __be32 dst, __be32 src, u32 table_id,
IPV4_DEVCONF_ALL(net, MC_FORWARDING)) {
int err = ipmr_get_route(net, skb,
fl4->saddr, fl4->daddr,
- r, nowait);
+ r, nowait, portid);
+
if (err <= 0) {
if (!nowait) {
if (err == 0)