Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/ethernet/broadcom/genet/bcmmii.c drivers/net/hyperv/netvsc.c kernel/bpf/hashtab.c Almost entirely overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -546,8 +546,10 @@ static void vrf_rt6_release(struct net_device *dev, struct net_vrf *vrf)
|
||||
}
|
||||
|
||||
if (rt6_local) {
|
||||
if (rt6_local->rt6i_idev)
|
||||
if (rt6_local->rt6i_idev) {
|
||||
in6_dev_put(rt6_local->rt6i_idev);
|
||||
rt6_local->rt6i_idev = NULL;
|
||||
}
|
||||
|
||||
dst = &rt6_local->dst;
|
||||
dev_put(dst->dev);
|
||||
|
Reference in New Issue
Block a user