diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-04-06 23:42:55 -0700 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2008-04-18 18:53:26 -0700 |
| commit | 1bb175b624fe8cf8b6acb5abb45810727a98ad80 (patch) | |
| tree | a2e67472f1a65de4de8c94d7017440c0a3577280 | |
| parent | 746b23e44e933a993777eb054ab6b44724a43d6e (diff) | |
| download | kernel-common-1bb175b624fe8cf8b6acb5abb45810727a98ad80.tar.gz kernel-common-1bb175b624fe8cf8b6acb5abb45810727a98ad80.tar.bz2 kernel-common-1bb175b624fe8cf8b6acb5abb45810727a98ad80.zip | |
NET: Fix multicast device ioctl checks
Upstream commit: 61ee6bd487b9cc160e533034eb338f2085dc7922
SIOCADDMULTI/SIOCDELMULTI check whether the driver has a set_multicast_list
method to determine whether it supports multicast. Drivers implementing
secondary unicast support use set_rx_mode however.
Check for both dev->set_multicast_mode and dev->set_rx_mode to determine
multicast capabilities.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 4d44372db5f7..82f77ef6d295 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3240,7 +3240,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd) return -EOPNOTSUPP; case SIOCADDMULTI: - if (!dev->set_multicast_list || + if ((!dev->set_multicast_list && !dev->set_rx_mode) || ifr->ifr_hwaddr.sa_family != AF_UNSPEC) return -EINVAL; if (!netif_device_present(dev)) @@ -3249,7 +3249,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd) dev->addr_len, 1); case SIOCDELMULTI: - if (!dev->set_multicast_list || + if ((!dev->set_multicast_list && !dev->set_rx_mode) || ifr->ifr_hwaddr.sa_family != AF_UNSPEC) return -EINVAL; if (!netif_device_present(dev)) |