public inbox for linux-m68k@lists.linux-m68k.org
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Michael Schmitz <schmitz@biophys.uni-duesseldorf.de>
Cc: linux-m68k@vger.kernel.org, Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH 06/11] m68k: Atari EtherNAT - use netdev_mc_count and netdev_mc_empty when appropriate
Date: Wed, 26 May 2010 19:48:48 +0200	[thread overview]
Message-ID: <1274896133-19590-7-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1274896133-19590-1-git-send-email-geert@linux-m68k.org>

Cfr. commit 4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5 ("net: use netdev_mc_count
and netdev_mc_empty when appropriate")

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 drivers/net/atari_91C111.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/atari_91C111.c b/drivers/net/atari_91C111.c
index 40a3774..f5aeb62 100644
--- a/drivers/net/atari_91C111.c
+++ b/drivers/net/atari_91C111.c
@@ -1451,7 +1451,7 @@ static void smc_set_multicast_list(struct net_device *dev)
 	 * I don't need to zero the multicast table, because the flag is
 	 * checked before the table is
 	 */
-	else if (dev->flags & IFF_ALLMULTI || dev->mc_count > 16) {
+	else if (dev->flags & IFF_ALLMULTI || netdev_mc_count(dev) > 16) {
 		DBG(2, "%s: RCR_ALMUL\n", dev->name);
 		lp->rcr_cur_mode |= RCR_ALMUL;
 	}
@@ -1468,7 +1468,7 @@ static void smc_set_multicast_list(struct net_device *dev)
 	 * the number of the 8 bit register, while the low 3 bits are the bit
 	 * within that register.
 	 */
-	else if (dev->mc_count)  {
+	else if (!netdev_mc_empty(dev)) {
 		int i;
 		struct dev_mc_list *cur_addr;
 
@@ -1479,7 +1479,7 @@ static void smc_set_multicast_list(struct net_device *dev)
 		memset(multicast_table, 0, sizeof(multicast_table));
 
 		cur_addr = dev->mc_list;
-		for (i = 0; i < dev->mc_count; i++, cur_addr = cur_addr->next) {
+		for (i = 0; i < netdev_mc_count(dev); i++, cur_addr = cur_addr->next) {
 			int position;
 
 			/* do we have a pointer here? */
-- 
1.7.0.4

  parent reply	other threads:[~2010-05-26 17:49 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-26 17:48 [PATCH 0/11] m68k: Atari EtherNAT Updates Geert Uytterhoeven
2010-05-26 17:48 ` [PATCH 01/11] m68k: Atari EtherNAT - request_irq - Remove unnecessary leading & from second arg Geert Uytterhoeven
2010-05-26 17:48 ` [PATCH 02/11] m68k: Atari EtherNAT - convert to dev_pm_ops Geert Uytterhoeven
2010-05-26 17:48 ` [PATCH 03/11] m68k: Atari EtherNAT - Fix irq flags Geert Uytterhoeven
2010-05-26 17:48 ` [PATCH 04/11] m68k: Atari EtherNAT - fix unused flags warnings on UP systems Geert Uytterhoeven
2010-05-26 17:48 ` [PATCH 05/11] m68k: Atari EtherNAT - Fix up type mismatch in smc_drv_resume() Geert Uytterhoeven
2010-05-26 17:48 ` Geert Uytterhoeven [this message]
2010-05-26 17:48 ` [PATCH 07/11] m68k: Atari EtherNAT - convert multiple drivers to use netdev_for_each_mc_addr Geert Uytterhoeven
2010-05-26 17:48 ` [PATCH 08/11] m68k: Atari EtherNAT - remove trailing space in messages Geert Uytterhoeven
2010-05-26 17:48 ` [PATCH 09/11] m68k: Atari EtherNAT - include cleanup: slab.h Geert Uytterhoeven
2010-05-26 17:48 ` [PATCH 10/11] m68k: Atari EtherNAT - convert multicast list to list_head Geert Uytterhoeven
2010-05-26 17:48 ` [PATCH 11/11] m68k: Atari EtherNAT - trans_start cleanups Geert Uytterhoeven
2010-06-06  3:59 ` [PATCH 0/11] m68k: Atari EtherNAT Updates Michael Schmitz
2010-06-06  8:25   ` Geert Uytterhoeven
2010-06-07  5:10     ` Michael Schmitz
2010-06-08 11:35       ` Geert Uytterhoeven

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1274896133-19590-7-git-send-email-geert@linux-m68k.org \
    --to=geert@linux-m68k.org \
    --cc=linux-m68k@vger.kernel.org \
    --cc=schmitz@biophys.uni-duesseldorf.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox