From patchwork Tue Feb 14 20:11:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 141180 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 2ECD91007D1 for ; Wed, 15 Feb 2012 07:12:09 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760635Ab2BNUMI (ORCPT ); Tue, 14 Feb 2012 15:12:08 -0500 Received: from mail-ww0-f44.google.com ([74.125.82.44]:60478 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755510Ab2BNUMF (ORCPT ); Tue, 14 Feb 2012 15:12:05 -0500 Received: by wgbdt10 with SMTP id dt10so262780wgb.1 for ; Tue, 14 Feb 2012 12:12:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:subject:from:to:cc:date:in-reply-to:references :content-type:x-mailer:content-transfer-encoding:mime-version; bh=chxL1svsL7zdaN7i/9T/Y4Xx7nrzFgyEB1YeE7xvhJk=; b=Ssl+UydllH4hp6Is6LLAloYH+HPXiYd/TQq9amRKzfHdDT4/U9f4O9ZrnnbeeGGbi7 DBTbYey3RimEdMwWVVeiodPnnFV1kL0esj8SMQopclmAjZkj2JpoA5f2ls1f1Ag+bflt QTHafSgU8Fohbyppfhg7V4wd2V47pkP3gQ6rY= Received: by 10.180.106.67 with SMTP id gs3mr4226860wib.7.1329250323827; Tue, 14 Feb 2012 12:12:03 -0800 (PST) Received: from [192.168.1.97] (122.237.66.86.rev.sfr.net. [86.66.237.122]) by mx.google.com with ESMTPS id gd8sm29102646wib.2.2012.02.14.12.12.00 (version=SSLv3 cipher=OTHER); Tue, 14 Feb 2012 12:12:01 -0800 (PST) Message-ID: <1329250319.2555.4.camel@edumazet-laptop> Subject: [PATCH] netpoll: netpoll_poll_dev() should access dev->flags From: Eric Dumazet To: David Miller Cc: amwang@redhat.com, netdev@vger.kernel.org, nhorman@tuxdriver.com Date: Tue, 14 Feb 2012 21:11:59 +0100 In-Reply-To: <20120214.144251.1481952602061158777.davem@davemloft.net> References: <1329217821.2336.3.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC> <20120214.144251.1481952602061158777.davem@davemloft.net> X-Mailer: Evolution 3.2.2- Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org commit 5a698af53f (bond: service netpoll arp queue on master device) tested IFF_SLAVE flag against dev->priv_flags instead of dev->flags Signed-off-by: Eric Dumazet Cc: WANG Cong Acked-by: Neil Horman --- net/core/netpoll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 556b082..ddefc51 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -194,7 +194,7 @@ static void netpoll_poll_dev(struct net_device *dev) poll_napi(dev); - if (dev->priv_flags & IFF_SLAVE) { + if (dev->flags & IFF_SLAVE) { if (dev->npinfo) { struct net_device *bond_dev = dev->master; struct sk_buff *skb;