From patchwork Wed May 11 06:30:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 620901 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 3r4R8F1Ljkz9t5Z for ; Wed, 11 May 2016 16:30:53 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=pHY/nQut; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751741AbcEKGaq (ORCPT ); Wed, 11 May 2016 02:30:46 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:35553 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751136AbcEKGao (ORCPT ); Wed, 11 May 2016 02:30:44 -0400 Received: by mail-pa0-f66.google.com with SMTP id zy2so3420654pac.2 for ; Tue, 10 May 2016 23:30:44 -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; bh=+FC5ZzozLP45onPal7/EgDg7C9Vfxufh7nfeTynUTCE=; b=pHY/nQutllxaXMM1Ht8/WPqjLFD6PX+fiv+xKzwexZKfxAt7WD8ACO09uqOtprwUAo Sn3HuOTg1zAGko9aw4xJtXZLQ6+PWE/lrZx+ZcJHykuByCKRUON2l7wyxhb8ESIhK9Ec HwQoWS0sWDl8g97AIKLh22A4bDxSkfYP/cylO3NbijhccmZNksD0QnQgpVTLWp77/78c 6MNbAMsBgipvZBOjGuy/8VrAIBBtlFUXwe3lRHnMF8lAHqCtB/s7iZFeGRewZm4yNKfh yaWpFQQR4yL8GcmKB0KTky9o/ee/USHjCHTHghrYYwUJ6AsaMpXJrixDaRazaqNGwHAM 72mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+FC5ZzozLP45onPal7/EgDg7C9Vfxufh7nfeTynUTCE=; b=WNqQb3KUJfVgtI/3El28UNMSOJT9wvwddQCRNMjo2MBHu4MF91cOkKQDmmjBNkumL5 IFMbcY80xgU2JlWcKn6KdkPIBBlGgGNA7cXjpKixrDtuYHOK7lpYpKWSw7/5/MB1gnni ie5Zq/9FiPNjDJ7ZUqJBgzGDWTbwC2TJXsYdEMlaNlDUwyF6u5SAMkPrTD9txomBiivS /35ypCKd8RT9TR89FTzJhXV/Pzqfq/VbJxVY3WoY91WP6lE9z7LOMRQBlJ2Xc0LqpJJe iZV969J+eCn0Yunk3zm2DxGN1qb6pNZjtGCKlp1jwyQWFTwuuHudihKuXY2+h6A3m136 s2qg== X-Gm-Message-State: AOPr4FUlFCnOAUf+DQWKa2XfBAwImZfXrzZZGw2lTIURygpsPtm+RmTMDOsjy5buZ6C47Q== X-Received: by 10.66.194.230 with SMTP id hz6mr2272221pac.132.1462948244267; Tue, 10 May 2016 23:30:44 -0700 (PDT) Received: from localhost.localdomain ([240f:4:c2bc:1:35da:1eb8:fc70:2f52]) by smtp.gmail.com with ESMTPSA id 199sm9037274pfc.15.2016.05.10.23.30.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 May 2016 23:30:43 -0700 (PDT) From: Akinobu Mita To: netdev@vger.kernel.org Cc: Akinobu Mita , Mike Sinkovsky , "David S . Miller" Subject: [PATCH -next 3/4] net: w5100: increase TX timeout period Date: Wed, 11 May 2016 15:30:26 +0900 Message-Id: <1462948227-21276-4-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1462948227-21276-1-git-send-email-akinobu.mita@gmail.com> References: <1462948227-21276-1-git-send-email-akinobu.mita@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This increases TX timeout period from one second to 5 seconds which is default value defined in net/sched/sch_generic.c. The one second timeout is too short for W5100 with SPI interface mode which doesn't support burst READ/WRITE processing in the SPI transfer. If the packet is transmitted while RX packets are being received at a very high rate, the TX transmittion work in the workqueue is delayed and the watchdog timer is expired. Signed-off-by: Akinobu Mita Cc: Mike Sinkovsky Cc: David S. Miller --- drivers/net/ethernet/wiznet/w5100.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c index c80438c..f649f1c 100644 --- a/drivers/net/ethernet/wiznet/w5100.c +++ b/drivers/net/ethernet/wiznet/w5100.c @@ -1142,7 +1142,7 @@ int w5100_probe(struct device *dev, const struct w5100_ops *ops, ndev->netdev_ops = &w5100_netdev_ops; ndev->ethtool_ops = &w5100_ethtool_ops; - ndev->watchdog_timeo = HZ; + ndev->watchdog_timeo = 5 * HZ; netif_napi_add(ndev, &priv->napi, w5100_napi_poll, 16); /* This chip doesn't support VLAN packets with normal MTU,