diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-09 17:22:08 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-09 17:22:08 -0500 |
| commit | e739cf1da48e841bc5d744a99764c1a668b4bdd2 (patch) | |
| tree | 1d39318bbbcdd66ad8cd34823ad9befb7af08b1f /net/core/dev_mcast.c | |
| parent | e7b184f199fd3c80b618ec8244cbda70857d2779 (diff) | |
| parent | 57d54889cd00db2752994b389ba714138652e60c (diff) | |
Merge commit 'v2.6.34-rc1' into for-2.6.35-incoming
Diffstat (limited to 'net/core/dev_mcast.c')
| -rw-r--r-- | net/core/dev_mcast.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c index 9e2fa39f22a3..fd91569e2394 100644 --- a/net/core/dev_mcast.c +++ b/net/core/dev_mcast.c | |||
| @@ -96,6 +96,8 @@ int dev_mc_add(struct net_device *dev, void *addr, int alen, int glbl) | |||
| 96 | int err; | 96 | int err; |
| 97 | 97 | ||
| 98 | netif_addr_lock_bh(dev); | 98 | netif_addr_lock_bh(dev); |
| 99 | if (alen != dev->addr_len) | ||
| 100 | return -EINVAL; | ||
| 99 | err = __dev_addr_add(&dev->mc_list, &dev->mc_count, addr, alen, glbl); | 101 | err = __dev_addr_add(&dev->mc_list, &dev->mc_count, addr, alen, glbl); |
| 100 | if (!err) | 102 | if (!err) |
| 101 | __dev_set_rx_mode(dev); | 103 | __dev_set_rx_mode(dev); |