mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
This commit is contained in:
commit
35eeacf182
97 changed files with 853 additions and 341 deletions
|
|
@ -4022,6 +4022,12 @@ static void addrconf_dad_completed(struct inet6_ifaddr *ifp, bool bump_id)
|
|||
|
||||
if (bump_id)
|
||||
rt_genid_bump_ipv6(dev_net(dev));
|
||||
|
||||
/* Make sure that a new temporary address will be created
|
||||
* before this temporary address becomes deprecated.
|
||||
*/
|
||||
if (ifp->flags & IFA_F_TEMPORARY)
|
||||
addrconf_verify_rtnl();
|
||||
}
|
||||
|
||||
static void addrconf_dad_run(struct inet6_dev *idev)
|
||||
|
|
|
|||
|
|
@ -779,6 +779,7 @@ static void mld_del_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im)
|
|||
psf->sf_crcount = im->mca_crcount;
|
||||
}
|
||||
in6_dev_put(pmc->idev);
|
||||
kfree(pmc);
|
||||
}
|
||||
spin_unlock_bh(&im->mca_lock);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1380,6 +1380,7 @@ static int ipip6_tunnel_init(struct net_device *dev)
|
|||
err = dst_cache_init(&tunnel->dst_cache, GFP_KERNEL);
|
||||
if (err) {
|
||||
free_percpu(dev->tstats);
|
||||
dev->tstats = NULL;
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue