From patchwork Tue Mar 3 18:38:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 445844 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 A539B1400B6 for ; Wed, 4 Mar 2015 05:39:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756857AbbCCSjF (ORCPT ); Tue, 3 Mar 2015 13:39:05 -0500 Received: from mailrelay106.isp.belgacom.be ([195.238.20.133]:43755 "EHLO mailrelay106.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755221AbbCCSjE (ORCPT ); Tue, 3 Mar 2015 13:39:04 -0500 X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=Xz9Uco7AEzg9ElRFdtKQLJViOsXK4SGQVO9ewqrYxis= c=1 sm=2 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=VPxjmE-vd6YzQ9RRNosA:9 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2ATDgCs/vVU/1Y2tFtagwKBLK5bBQEBAQEBAQUBd4tti2iBKU4BAQEBAQF8hD0vI4EaN4gzAdZnhgaJeh2EFQWFcJNSiw+IUCOBRQE8HIFRPTEBgkIBAQE Received: from 86.54-180-91.adsl-dyn.isp.belgacom.be (HELO localhost.home.) ([91.180.54.86]) by relay.skynet.be with ESMTP; 03 Mar 2015 19:39:02 +0100 From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: davem@davemloft.net, chas@cmf.nrl.navy.mil, Fabian Frederick , netdev@vger.kernel.org Subject: [PATCH 1/1 net-next] net/atm/signaling.c: remove WAIT_FOR_DEMON code Date: Tue, 3 Mar 2015 19:38:46 +0100 Message-Id: <1425407926-15917-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org WAIT_FOR_DEMON code is directly undefined at the beginning of signaling.c since initial git version and thus never compiled. This also removes buggy current->state direct access. Suggested-by: Chas Williams Signed-off-by: Fabian Frederick --- net/atm/signaling.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/net/atm/signaling.c b/net/atm/signaling.c index 523bce7..4fd6af4 100644 --- a/net/atm/signaling.c +++ b/net/atm/signaling.c @@ -19,36 +19,15 @@ #include "resources.h" #include "signaling.h" -#undef WAIT_FOR_DEMON /* #define this if system calls on SVC sockets - should block until the demon runs. - Danger: may cause nasty hangs if the demon - crashes. */ - struct atm_vcc *sigd = NULL; -#ifdef WAIT_FOR_DEMON -static DECLARE_WAIT_QUEUE_HEAD(sigd_sleep); -#endif static void sigd_put_skb(struct sk_buff *skb) { -#ifdef WAIT_FOR_DEMON - DECLARE_WAITQUEUE(wait, current); - - add_wait_queue(&sigd_sleep, &wait); - while (!sigd) { - set_current_state(TASK_UNINTERRUPTIBLE); - pr_debug("atmsvc: waiting for signaling daemon...\n"); - schedule(); - } - current->state = TASK_RUNNING; - remove_wait_queue(&sigd_sleep, &wait); -#else if (!sigd) { pr_debug("atmsvc: no signaling daemon\n"); kfree_skb(skb); return; } -#endif atm_force_charge(sigd, skb->truesize); skb_queue_tail(&sk_atm(sigd)->sk_receive_queue, skb); sk_atm(sigd)->sk_data_ready(sk_atm(sigd)); @@ -261,8 +240,5 @@ int sigd_attach(struct atm_vcc *vcc) vcc_insert_socket(sk_atm(vcc)); set_bit(ATM_VF_META, &vcc->flags); set_bit(ATM_VF_READY, &vcc->flags); -#ifdef WAIT_FOR_DEMON - wake_up(&sigd_sleep); -#endif return 0; }