diff --git a/[refs] b/[refs] index ebf6aa0957c5..a9389ef09e58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a141509ede48ac33ef756ac1640f4d3f46fa2db +refs/heads/master: 3041f5170751e3522aa1bd6e8ca5d98e846720b0 diff --git a/trunk/net/core/dev_mcast.c b/trunk/net/core/dev_mcast.c index fd91569e2394..3dc295beb483 100644 --- a/trunk/net/core/dev_mcast.c +++ b/trunk/net/core/dev_mcast.c @@ -97,8 +97,9 @@ int dev_mc_add(struct net_device *dev, void *addr, int alen, int glbl) 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); + err = -EINVAL; + else + err = __dev_addr_add(&dev->mc_list, &dev->mc_count, addr, alen, glbl); if (!err) __dev_set_rx_mode(dev); netif_addr_unlock_bh(dev);