From: David S. Miller <davem@davemloft.net>
Date: Mon, 8 Sep 2014 04:41:53 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.18-rc1~52^2~139
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=eb84d6b60491a3ca3d90d62ee5346b007770d40d

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

eb84d6b60491a3ca3d90d62ee5346b007770d40d
diff --cc net/ipv6/mcast.c
index 64919425f1ab,a23b655a7627..6833dd07b2c2
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@@ -917,8 -928,10 +929,10 @@@ int __ipv6_dev_mc_dec(struct inet6_dev 
  {
  	struct ifmcaddr6 *ma, **map;
  
+ 	ASSERT_RTNL();
+ 
  	write_lock_bh(&idev->lock);
 -	for (map = &idev->mc_list; (ma=*map) != NULL; map = &ma->next) {
 +	for (map = &idev->mc_list; (ma = *map) != NULL; map = &ma->next) {
  		if (ipv6_addr_equal(&ma->mca_addr, addr)) {
  			if (--ma->mca_users == 0) {
  				*map = ma->next;