Received: by 2002:a05:6a10:d5a5:0:0:0:0 with SMTP id gn37csp3923189pxb; Mon, 4 Oct 2021 12:44:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4GN49KOh9DefNvK8xMlUOvVonnUQJc7fmH1y3OvEuTniKtFtV0KECmpD6Y4yx+Ir94Uy/ X-Received: by 2002:a05:6402:424a:: with SMTP id g10mr19071439edb.26.1633376680721; Mon, 04 Oct 2021 12:44:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633376680; cv=none; d=google.com; s=arc-20160816; b=Y51kvKtpZioBIfzwz+DZl7MXPhVlOSrlsadbPO9O5dijqov641qxiuUqUY9TabiFPf iRXPwBaFXm78alwCiEOT6E+0JYqYMlduzUl3bbgxL+m+ZCoW/tLmMg8gX84s7M+AVoTB XUNeQ6i94oItAtwPWcYXRiJv5OBCcti49hJMCJQFVmQyvZWylhqAE1TyaHkWcU2o+qE/ 7dhGZIXYtMsw8N/dPqMK3l7XJ2Z2KUcNcbjCCTzC+anAX5AtvKaVmICS7PKcPvp7Ghou NOovYbjdigJEbAOmh8pLnjHN59L7y39gSR7em3k4ra5fKowSmoJLxyB5WCGRbrOwpjXo 4wOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2WvkSkK4wyByESck94agv0McmbdX4lJ366t/IT/zdII=; b=WN8YVpTWcceoT9uYHRr5KHtij3ptEUJoxLkQpD4vK6g/lUdYuYarUzgt0NvjiTAxcf pziUm/DmFukuWFK7B8wfOt0wiYd8+KCZTOBsBYxts2I7LKeR7HntoPF+O2rg8jJww7DP DwuCrqejRIMsqXzNN3JnPJ+JKD5XoZa+Hgi8YsiTLPz1ni3DpQFK86Ff3ic3IkkFRRAw 7pQTSDRjCRTFcBT/kmh2hLNF3eIxidqUFn6ETEKCTrElFm6J34MANvyJ3knlOkK+8ifD 0M5SLiaaxaAtNqVvdW9uOD7AuIViOLLh2Suu2kzxcExH1VNC4XKsTI3/Cpya/GxTRCpy MX8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=j0rTVcIc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a17si4553273edb.109.2021.10.04.12.44.14; Mon, 04 Oct 2021 12:44:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=j0rTVcIc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235780AbhJDNLl (ORCPT + 99 others); Mon, 4 Oct 2021 09:11:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:45800 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234842AbhJDNJF (ORCPT ); Mon, 4 Oct 2021 09:09:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 06B9F61A6E; Mon, 4 Oct 2021 13:03:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633352591; bh=ywR63XgBpffWVRi38eU7M2igpbFWInfgO2qlcRgWcJA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j0rTVcIc6kzTGby5jjIDH9V/icAnl73aGQbVVYLOPi2vNK6+q3O/h5Al/2eFK7ICM Og9tv+ta/qmcIL1lLgUNDTHBYldYvl9ecvqF7U9rRpId6/3zK986FHMQM13AwFem2k YPB3bzW25lh7qcooC7lFRQ31DBXwACL8no02Z8ew= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guenter Roeck , Linus Torvalds , Sasha Levin Subject: [PATCH 4.19 45/95] net: 6pack: Fix tx timeout and slot time Date: Mon, 4 Oct 2021 14:52:15 +0200 Message-Id: <20211004125035.053484120@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211004125033.572932188@linuxfoundation.org> References: <20211004125033.572932188@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guenter Roeck [ Upstream commit 3c0d2a46c0141913dc6fd126c57d0615677d946e ] tx timeout and slot time are currently specified in units of HZ. On Alpha, HZ is defined as 1024. When building alpha:allmodconfig, this results in the following error message. drivers/net/hamradio/6pack.c: In function 'sixpack_open': drivers/net/hamradio/6pack.c:71:41: error: unsigned conversion from 'int' to 'unsigned char' changes value from '256' to '0' In the 6PACK protocol, tx timeout is specified in units of 10 ms and transmitted over the wire: https://www.linux-ax25.org/wiki/6PACK Defining a value dependent on HZ doesn't really make sense, and presumably comes from the (very historical) situation where HZ was originally 100. Note that the SIXP_SLOTTIME use explicitly is about 10ms granularity: mod_timer(&sp->tx_t, jiffies + ((when + 1) * HZ) / 100); and the SIXP_TXDELAY walue is sent as a byte over the wire. Signed-off-by: Guenter Roeck Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- drivers/net/hamradio/6pack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 1001e9a2edd4..af776d7be780 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -68,9 +68,9 @@ #define SIXP_DAMA_OFF 0 /* default level 2 parameters */ -#define SIXP_TXDELAY (HZ/4) /* in 1 s */ +#define SIXP_TXDELAY 25 /* 250 ms */ #define SIXP_PERSIST 50 /* in 256ths */ -#define SIXP_SLOTTIME (HZ/10) /* in 1 s */ +#define SIXP_SLOTTIME 10 /* 100 ms */ #define SIXP_INIT_RESYNC_TIMEOUT (3*HZ/2) /* in 1 s */ #define SIXP_RESYNC_TIMEOUT 5*HZ /* in 1 s */ -- 2.33.0