aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/qlge/qlge_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/qlge/qlge_main.c')
-rw-r--r--drivers/net/qlge/qlge_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 3cb60e10d456..dd3e0f1b2965 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -4221,7 +4221,7 @@ static void qlge_set_multicast_list(struct net_device *ndev)
4221 * transition is taking place. 4221 * transition is taking place.
4222 */ 4222 */
4223 if ((ndev->flags & IFF_ALLMULTI) || 4223 if ((ndev->flags & IFF_ALLMULTI) ||
4224 (ndev->mc_count > MAX_MULTICAST_ENTRIES)) { 4224 (netdev_mc_count(ndev) > MAX_MULTICAST_ENTRIES)) {
4225 if (!test_bit(QL_ALLMULTI, &qdev->flags)) { 4225 if (!test_bit(QL_ALLMULTI, &qdev->flags)) {
4226 if (ql_set_routing_reg 4226 if (ql_set_routing_reg
4227 (qdev, RT_IDX_ALLMULTI_SLOT, RT_IDX_MCAST, 1)) { 4227 (qdev, RT_IDX_ALLMULTI_SLOT, RT_IDX_MCAST, 1)) {
@@ -4243,7 +4243,7 @@ static void qlge_set_multicast_list(struct net_device *ndev)
4243 } 4243 }
4244 } 4244 }
4245 4245
4246 if (ndev->mc_count) { 4246 if (!netdev_mc_empty(ndev)) {
4247 status = ql_sem_spinlock(qdev, SEM_MAC_ADDR_MASK); 4247 status = ql_sem_spinlock(qdev, SEM_MAC_ADDR_MASK);
4248 if (status) 4248 if (status)
4249 goto exit; 4249 goto exit;