From patchwork Wed Apr 24 08:09:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 239069 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 3DE752C00C3 for ; Wed, 24 Apr 2013 18:10:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757942Ab3DXIKd (ORCPT ); Wed, 24 Apr 2013 04:10:33 -0400 Received: from intranet.asianux.com ([58.214.24.6]:25991 "EHLO intranet.asianux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757849Ab3DXIKa (ORCPT ); Wed, 24 Apr 2013 04:10:30 -0400 Received: by intranet.asianux.com (Postfix, from userid 103) id 1ADB2184029C; Wed, 24 Apr 2013 16:10:29 +0800 (CST) X-Spam-Score: -100.8 X-Spam-Checker-Version: SpamAssassin 3.1.9 (2007-02-13) on intranet.asianux.com X-Spam-Level: X-Spam-Status: No, score=-100.8 required=5.0 tests=AWL,BAYES_00, RATWARE_GECKO_BUILD,USER_IN_WHITELIST autolearn=no version=3.1.9 Received: from [10.1.0.143] (unknown [219.143.36.82]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by intranet.asianux.com (Postfix) with ESMTP id C0C3E1840242; Wed, 24 Apr 2013 16:10:28 +0800 (CST) Message-ID: <51779347.2000808@asianux.com> Date: Wed, 24 Apr 2013 16:09:43 +0800 From: Chen Gang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: David Miller , kaber@trash.net, xemul@parallels.com, avagin@openvz.org, netdev Subject: [PATCH net-next] netlink: compiling issue, need a dummy function sk_diag_put_rings_cfg when CONFIG_NETLINK_MMAP disabled Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When disable CONFIG_NETLINK_MMAP, need a dummy function for sk_diag_put_rings_cfg, or will cause compiling issue. Signed-off-by: Chen Gang --- net/netlink/diag.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/net/netlink/diag.c b/net/netlink/diag.c index 4e4aa47..d0ab090 100644 --- a/net/netlink/diag.c +++ b/net/netlink/diag.c @@ -7,6 +7,8 @@ #include "af_netlink.h" +#ifdef CONFIG_NETLINK_MMAP + static int sk_diag_put_ring(struct netlink_ring *ring, int nl_type, struct sk_buff *nlskb) { @@ -35,6 +37,15 @@ static int sk_diag_put_rings_cfg(struct sock *sk, struct sk_buff *nlskb) return ret; } +#else /* !CONFIG_NETLINK_MMAP */ + +static int sk_diag_put_rings_cfg(struct sock *sk, struct sk_buff *nlskb) +{ + return 0; +} + +#endif /* CONFIG_NETLINK_MMAP */ + static int sk_diag_dump_groups(struct sock *sk, struct sk_buff *nlskb) { struct netlink_sock *nlk = nlk_sk(sk);