mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Just some simple overlapping changes in marvell PHY driver and the DSA core code. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
216fe8f021
436 changed files with 3741 additions and 2070 deletions
|
|
@ -1483,7 +1483,7 @@ static void mpls_ifup(struct net_device *dev, unsigned int flags)
|
|||
continue;
|
||||
alive++;
|
||||
nh_flags &= ~flags;
|
||||
WRITE_ONCE(nh->nh_flags, flags);
|
||||
WRITE_ONCE(nh->nh_flags, nh_flags);
|
||||
} endfor_nexthops(rt);
|
||||
|
||||
WRITE_ONCE(rt->rt_nhn_alive, alive);
|
||||
|
|
|
|||
Loading…
Reference in a new issue