From patchwork Thu Mar 3 04:26:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 85227 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 A5052B70AF for ; Thu, 3 Mar 2011 15:27:07 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758134Ab1CCE1C (ORCPT ); Wed, 2 Mar 2011 23:27:02 -0500 Received: from mail-yx0-f174.google.com ([209.85.213.174]:55237 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758081Ab1CCE1B (ORCPT ); Wed, 2 Mar 2011 23:27:01 -0500 Received: by yxs7 with SMTP id 7so227804yxs.19 for ; Wed, 02 Mar 2011 20:27:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=MmvF0jiZXMcEDcyOqS3LbhlAkIR6XeeH7jro5DiCwGY=; b=xF1cJB5mEntikhNNy9PSazdrqeWWryoXa2+E5QBMsmopKOF19hH4MpO/pbvOmtUz7e ME8Fx0/p9Kly/665+rsSfGFvBD3DczaxWSjKK8M53cQdiTegnoWOQNcsNdvI28Gr357K yyk8mImSk0Sft7/QzlQCHP/iHIzZz2Zon0vCU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=h29ADsENA3cGxAwtJ9PF0pqTREX1Y81XFAMDinQPSfqk/j7X5g4h686+sMtuUBAZAy wB4BdMcNF27LMrXkjzcGrN6ZJqdgMnfpBgv6j76jKqncg04XcDkfgGNtqx/9/sPMW6x6 NWe8pXJhk+P9FZqWBX2KyZYb9csqoVKuMRg2Q= Received: by 10.151.7.13 with SMTP id k13mr1138674ybi.373.1299126420587; Wed, 02 Mar 2011 20:27:00 -0800 (PST) Received: from localhost.localdomain ([221.239.34.230]) by mx.google.com with ESMTPS id z70sm504794yhc.34.2011.03.02.20.26.55 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 02 Mar 2011 20:26:59 -0800 (PST) From: Changli Gao To: Jay Vosburgh Cc: "David S. Miller" , netdev@vger.kernel.org, Changli Gao Subject: [PATCH 1/2] bonding: remove the unused dummy functions when net poll controller isn't enabled Date: Thu, 3 Mar 2011 12:26:21 +0800 Message-Id: <1299126381-9338-1-git-send-email-xiaosuo@gmail.com> X-Mailer: git-send-email 1.7.3.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org These two functions are only used when net poll controller is enabled. Signed-off-by: Changli Gao --- drivers/net/bonding/bond_main.c | 8 -------- 1 file changed, 8 deletions(-) -- 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/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 0592e6d..912b416 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1380,14 +1380,6 @@ static inline void slave_disable_netpoll(struct slave *slave) static void bond_netpoll_cleanup(struct net_device *bond_dev) { } -static int bond_netpoll_setup(struct net_device *dev, struct netpoll_info *ni) -{ - return 0; -} -static struct netpoll_info *bond_netpoll_info(struct bonding *bond) -{ - return NULL; -} #endif /*---------------------------------- IOCTL ----------------------------------*/