diff --git a/[refs] b/[refs]
index 9f6644bd7a83..97491286cb28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c79c5ffdce14abb4de3878c5aa8c3c6e5093c69b
+refs/heads/master: 6e17d45ae310758ab30623a42ad070858c9a48de
diff --git a/trunk/net/core/dev_mcast.c b/trunk/net/core/dev_mcast.c
index 9e2fa39f22a3..fd91569e2394 100644
--- a/trunk/net/core/dev_mcast.c
+++ b/trunk/net/core/dev_mcast.c
@@ -96,6 +96,8 @@ int dev_mc_add(struct net_device *dev, void *addr, int alen, int glbl)
 	int err;
 
 	netif_addr_lock_bh(dev);
+	if (alen != dev->addr_len)
+		return -EINVAL;
 	err = __dev_addr_add(&dev->mc_list, &dev->mc_count, addr, alen, glbl);
 	if (!err)
 		__dev_set_rx_mode(dev);