diff --cc net/ipv6/mcast.c
index 0c63c33ab080,616bf4c0c8fd..36ca27496b3c
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@@ -786,34 -783,37 +786,34 @@@ static void mld_del_delrec(struct inet6
  			break;
  		pmc_prev = pmc;
  	}
 -	if (pmc) {
 -		if (pmc_prev)
 -			rcu_assign_pointer(pmc_prev->next, pmc->next);
 -		else
 -			rcu_assign_pointer(idev->mc_tomb, pmc->next);
 -	}
 +	if (!pmc)
 +		return;
 +	if (pmc_prev)
 +		rcu_assign_pointer(pmc_prev->next, pmc->next);
 +	else
 +		rcu_assign_pointer(idev->mc_tomb, pmc->next);
  
 -	if (pmc) {
 -		im->idev = pmc->idev;
 -		if (im->mca_sfmode == MCAST_INCLUDE) {
 -			tomb = rcu_replace_pointer(im->mca_tomb,
 -						   mc_dereference(pmc->mca_tomb, pmc->idev),
 -						   lockdep_is_held(&im->idev->mc_lock));
 -			rcu_assign_pointer(pmc->mca_tomb, tomb);
 +	im->idev = pmc->idev;
 +	if (im->mca_sfmode == MCAST_INCLUDE) {
 +		tomb = rcu_replace_pointer(im->mca_tomb,
 +					   mc_dereference(pmc->mca_tomb, pmc->idev),
 +					   lockdep_is_held(&im->idev->mc_lock));
 +		rcu_assign_pointer(pmc->mca_tomb, tomb);
  
 -			sources = rcu_replace_pointer(im->mca_sources,
 -						      mc_dereference(pmc->mca_sources, pmc->idev),
 -						      lockdep_is_held(&im->idev->mc_lock));
 -			rcu_assign_pointer(pmc->mca_sources, sources);
 -			for_each_psf_mclock(im, psf)
 -				psf->sf_crcount = idev->mc_qrv;
 -		} else {
 -			im->mca_crcount = idev->mc_qrv;
 -		}
 -		ip6_mc_clear_src(pmc);
 -		in6_dev_put(pmc->idev);
 -		kfree_rcu(pmc, rcu);
 +		sources = rcu_replace_pointer(im->mca_sources,
 +					      mc_dereference(pmc->mca_sources, pmc->idev),
 +					      lockdep_is_held(&im->idev->mc_lock));
 +		rcu_assign_pointer(pmc->mca_sources, sources);
 +		for_each_psf_mclock(im, psf)
 +			psf->sf_crcount = idev->mc_qrv;
 +	} else {
 +		im->mca_crcount = idev->mc_qrv;
  	}
- 	in6_dev_put(pmc->idev);
 +	ip6_mc_clear_src(pmc);
++	in6_dev_put(pmc->idev);
 +	kfree_rcu(pmc, rcu);
  }
  
 -/* called with mc_lock */
  static void mld_clear_delrec(struct inet6_dev *idev)
  {
  	struct ifmcaddr6 *pmc, *nextpmc;