A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 03:01:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse source 
Minor conflict with the DSA legacy code removal.

Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
David S. Miller 2019-05-07 17:22:09 -07:00
commit a9e41a5296
23 changed files with 293 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

3
net/ipv4/ipmr_base.c
View file

@ -335,8 +335,6 @@ next_entry2:
}
spin_unlock_bh(lock);
err = 0;
e = 0;
out:
cb->args[1] = e;
return err;
@ -374,6 +372,7 @@ int mr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb,
err = mr_table_dump(mrt, skb, cb, fill, lock, filter);
if (err < 0)
break;
cb->args[1] = 0;
next_table:
t++;
}