From patchwork Fri Jun 27 02:09:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Li RongQing X-Patchwork-Id: 364754 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 E0AD21400B5 for ; Fri, 27 Jun 2014 12:09:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752383AbaF0CJl (ORCPT ); Thu, 26 Jun 2014 22:09:41 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:60678 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752242AbaF0CJk (ORCPT ); Thu, 26 Jun 2014 22:09:40 -0400 Received: by mail-pa0-f46.google.com with SMTP id eu11so3949112pac.33 for ; Thu, 26 Jun 2014 19:09:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=bY8/lhaFux0BhqNSvFdOzDKWCHO6VKMEHdlNkayKNUM=; b=EymuC7orw265PVxylRN88QEDDRRuV0vwU5EnOHOLfJAF/COM+yEyGCxgQAurN9VwFY zSfhYZD/eo/h8HhltKAfHK7OASkL6IHOQ/U3dkCiwBkUg7Iwg1HjgK01u9yM7pPHfhXO s7f67N9QYMLf03TmZGKylmcGaBciiYsO2/5kZ44KuwCDONf9xK1Yl9JapRBSfgHUT+2T aLWSqBrKAGWPVO4rSvU01xJ8cUjjJov7djSFqJVPRshQQgdgf7mwfkxMr9xy3YOVpySS Mgfplsk3RdxZXOLLoV6DN2PHUSt8DcAXzx4AuiigalOAU7AW3R6ZP292/6yAuJoNHY1Z cumw== X-Received: by 10.68.102.3 with SMTP id fk3mr26347936pbb.95.1403834980411; Thu, 26 Jun 2014 19:09:40 -0700 (PDT) Received: from localhost ([1.202.252.122]) by mx.google.com with ESMTPSA id gw8sm12069054pbc.28.2014.06.26.19.09.37 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 26 Jun 2014 19:09:39 -0700 (PDT) From: roy.qing.li@gmail.com To: netdev@vger.kernel.org Cc: jim.epost@gmail.com, _govind@gmx.com Subject: [PATCH] enic: fix a building failure Date: Fri, 27 Jun 2014 10:09:39 +0800 Message-Id: <1403834979-598-1-git-send-email-roy.qing.li@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Li RongQing When RFS_ACCEL is disabled, the building failed: drivers/net/ethernet/cisco/enic/enic_main.c: In function ‘enic_open’: drivers/net/ethernet/cisco/enic/enic_main.c:1603:2: error: implicit declaration of function ‘enic_rfs_flw_tbl_init’ [-Werror=implicit-function-declaration] enic_rfs_flw_tbl_init(enic); ^ drivers/net/ethernet/cisco/enic/enic_main.c: In function ‘enic_stop’: drivers/net/ethernet/cisco/enic/enic_main.c:1630:2: error: implicit declaration of function ‘enic_rfs_flw_tbl_free’ [-Werror=implicit-function-declaration] enic_rfs_flw_tbl_free(enic); In fact, these two functions have been defined separately for enabling RFS_ACCEL and disabling RFS_ACCEL. Reported-by: Jim Davis Cc: Govindarajulu Varadarajan <_govind@gmx.com> Signed-off-by: Li RongQing --- drivers/net/ethernet/cisco/enic/enic_clsf.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/ethernet/cisco/enic/enic_clsf.h b/drivers/net/ethernet/cisco/enic/enic_clsf.h index 76a85bb..b38cc7e 100644 --- a/drivers/net/ethernet/cisco/enic/enic_clsf.h +++ b/drivers/net/ethernet/cisco/enic/enic_clsf.h @@ -9,11 +9,8 @@ int enic_addfltr_5t(struct enic *enic, struct flow_keys *keys, u16 rq); int enic_delfltr(struct enic *enic, u16 filter_id); -#ifdef CONFIG_RFS_ACCEL void enic_rfs_flw_tbl_init(struct enic *enic); void enic_rfs_flw_tbl_free(struct enic *enic); int enic_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb, u16 rxq_index, u32 flow_id); -#endif /* CONFIG_RFS_ACCEL */ - #endif /* _ENIC_CLSF_H_ */