From patchwork Thu Aug 1 03:10:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Amerigo Wang X-Patchwork-Id: 263882 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 7A9802C00C1 for ; Thu, 1 Aug 2013 13:11:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752040Ab3HADKi (ORCPT ); Wed, 31 Jul 2013 23:10:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53639 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751083Ab3HADKh (ORCPT ); Wed, 31 Jul 2013 23:10:37 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r713AZJ8011096 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 31 Jul 2013 23:10:35 -0400 Received: from localhost.localdomain (vpn1-114-240.nay.redhat.com [10.66.114.240]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r713AWbS022674; Wed, 31 Jul 2013 23:10:33 -0400 From: Cong Wang To: netdev@vger.kernel.org Cc: "David S. Miller" , Eliezer Tamir , Cong Wang Subject: =?UTF-8?q?=5BPatch=20net-next=201/2=5D=20net=3A=20fix=20a=20compile=20error=20when=20CONFIG=5FNET=5FLL=5FRX=5FPOLL=20is=20not=20set?= Date: Thu, 1 Aug 2013 11:10:24 +0800 Message-Id: <1375326625-21427-1-git-send-email-amwang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Cong Wang When CONFIG_NET_LL_RX_POLL is not set, I got: net/socket.c: In function ‘sock_poll’: net/socket.c:1165:4: error: implicit declaration of function ‘sk_busy_loop’ [-Werror=implicit-function-declaration] Fix this by adding a nop when !CONFIG_NET_LL_RX_POLL. Cc: Eliezer Tamir Cc: David S. Miller Signed-off-by: Cong Wang --- -- 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/include/net/busy_poll.h b/include/net/busy_poll.h index a14339c..6cd8848 100644 --- a/include/net/busy_poll.h +++ b/include/net/busy_poll.h @@ -181,5 +181,10 @@ static inline bool busy_loop_timeout(unsigned long end_time) return true; } +static inline bool sk_busy_loop(struct sock *sk, int nonblock) +{ + return false; +} + #endif /* CONFIG_NET_LL_RX_POLL */ #endif /* _LINUX_NET_BUSY_POLL_H */