From patchwork Sun Feb 21 02:37:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 45943 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B7FB4B7CA6 for ; Sun, 21 Feb 2010 13:37:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756574Ab0BUCha (ORCPT ); Sat, 20 Feb 2010 21:37:30 -0500 Received: from fg-out-1718.google.com ([72.14.220.152]:31997 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756308Ab0BUCh3 (ORCPT ); Sat, 20 Feb 2010 21:37:29 -0500 Received: by fg-out-1718.google.com with SMTP id e21so62852fga.1 for ; Sat, 20 Feb 2010 18:37:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=Z+YYOpAFQ/YlsFNjsWDaAkj1t9/i1255kQGoD3kHbmU=; b=rNqMhRX8/pVWYZW0PlZZjqvHsozzNayGHnC58+BAw8Af6Xa4euiBnnE0zSmiqWWnrE LR/F4aJcopt1KjKRdtFJdFPhIeNOMHX8YKoreV7RrvAYClkLsZwtjONoCsJK4TXUrPPL h75FIskbInM4+uDShAJUdfLraQtSg9bMDAOLE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=yCWOXtBV1as9jaN7TcRBdpiUgph52E51HireMJWplJoEO/65TYme80f9xJwuTpW+NW DcTYxhz9IO8rRzfUEpT+3DNZeLxqqrBTj6sxc6s/D2hXS0vbbs496zcYnUehp2Os8uPa ePFGQ4rXP3ml7Xq+ElSMKRlbTQ0qLiRS3lx14= Received: by 10.87.44.30 with SMTP id w30mr2407934fgj.5.1266719847188; Sat, 20 Feb 2010 18:37:27 -0800 (PST) Received: from localhost.localdomain (ppp85-140-245-231.pppoe.mtu-net.ru [85.140.245.231]) by mx.google.com with ESMTPS id 3sm4170943fge.21.2010.02.20.18.37.26 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 20 Feb 2010 18:37:26 -0800 (PST) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov , Jiri Pirko Subject: [PATCH next] eepro: fix netdev_mc_count conversion Date: Sun, 21 Feb 2010 05:37:16 +0300 Message-Id: <1266719836-22416-1-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.7.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix commit 4cd24eaf0 (net: use netdev_mc_count and netdev_mc_empty when appropriate) Cc: Jiri Pirko Signed-off-by: Alexander Beregalov --- drivers/net/eepro.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index 488bc13..5f73ab2 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/eepro.c @@ -1288,7 +1288,7 @@ set_multicast_list(struct net_device *dev) short ioaddr = dev->base_addr; unsigned short mode; struct dev_mc_list *dmi=dev->mc_list; - int mc_count = mc_count; + int mc_count = netdev_mc_count(dev); if (dev->flags&(IFF_ALLMULTI|IFF_PROMISC) || mc_count > 63) {