From patchwork Fri Jul 12 13:49:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Hoffmann X-Patchwork-Id: 1959913 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=Bnmmy1US; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=3e8.eu header.i=@3e8.eu header.a=rsa-sha256 header.s=mail20211217 header.b=DcgudItu; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WLF1D5TvFz1xqx for ; Sat, 13 Jul 2024 00:52:00 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ui/dQHDAqLBDdDjwKyGz0TgzJfhaBd1dW8aUNoDxrnc=; b=Bnmmy1USmmjt7d 9cW0taGG2Hifp0j1dpF0l67n6Mb8+t76Pnl6zXYLA8MbCphvs3Fz7rBmDHDpGzuWQqpVL4a/WrGcN PxNN1dqu2ZnlW4buXyG0A+KD82t28efWueS52f1ITUCzkI9wuaGL+NgkPa2V4O+quQC/Mq6W8Msg1 QXwjFuJkB2vVM5GCp+C7QI7Qt4xHEGvgA0wwe/zaY6iYk2D7JmW7AXK86vAs/3JhmOIkml+IYEhLy oVJ15MqNt4MuZngpgDp1wksS3NNkscnJyRWIOZj6Wo0/U/uZNz+NLycKlY1h7VLqoCs1DvbsXRnlO 8IkZZkvsYulResjGpaFQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sSHb6-00000000NrW-05Z2; Fri, 12 Jul 2024 14:50:08 +0000 Received: from srv5.3e8.eu ([2a03:4000:28:8d0::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sSHb2-00000000Npw-3qbn for openwrt-devel@lists.openwrt.org; Fri, 12 Jul 2024 14:50:06 +0000 Received: from localhost.localdomain (p200300c6cf02cba0ae21e636d180025d.dip0.t-ipconnect.de [IPv6:2003:c6:cf02:cba0:ae21:e636:d180:25d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by srv5.3e8.eu (Postfix) with ESMTPSA id BF15B12087D; Fri, 12 Jul 2024 16:49:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=3e8.eu; s=mail20211217; t=1720795772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TxrY1iOmZcr7AE/BDeRwOwaeyuWzy81PHCLe7hPJrtU=; b=DcgudItuKNkEzCHe2p/Va0ITKbt31ivJjYSsWBp9Kbk64OGYAlILlBV7u4v4iUggPuG/Ei 4y8yRrpRiuiIvR/ApsrvNjpvKcVfw7+j6c1bp+Zz/CXYEl3C2thKLdynj2pgZNL08YcqQz XzblsoqPpS/QowCGYDHEAXJx+wnm0uYJvQBrUqFF1aWkUpRVu//5yUTVJaxSSUH1bzz+f+ spURpo6/pa/3B+u26PM5FYkxtBM0TiZDlR6FvBWH96dz5ChsEva1dDWMh3VQLoVr/tEYDU 2lr2+l0GaT5Cx5S5AhvIXruJBMChaij4mETWh1ty6wcHXrMTmekDBAFbZ7CCTw== From: Jan Hoffmann To: openwrt-devel@lists.openwrt.org Cc: Jan Hoffmann Subject: [PATCH 1/5] ltq-vdsl-vr9-app: fix error handling during disconnection Date: Fri, 12 Jul 2024 15:49:49 +0200 Message-ID: <20240712144801.1192493-2-jan@3e8.eu> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240712144801.1192493-1-jan@3e8.eu> References: <20240712144801.1192493-1-jan@3e8.eu> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240712_075005_137272_B49ED38B X-CRM114-Status: UNSURE ( 9.88 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.1 (--) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Use the correct return value in error message. Fixes: 1daaef31b352 ("ltq-vdsl-app: disconnect when service is stopped") Signed-off-by: Jan Hoffmann --- package/network/config/ltq-vdsl-vr9-app/Makefile | 2 +- .../network/config/ltq-vds [...] Content analysis details: (-2.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Use the correct return value in error message. Fixes: 1daaef31b352 ("ltq-vdsl-app: disconnect when service is stopped") Signed-off-by: Jan Hoffmann --- package/network/config/ltq-vdsl-vr9-app/Makefile | 2 +- .../network/config/ltq-vdsl-vr9-app/patches/200-autoboot.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/config/ltq-vdsl-vr9-app/Makefile b/package/network/config/ltq-vdsl-vr9-app/Makefile index c51489e2c5fa..e2042bf314d8 100644 --- a/package/network/config/ltq-vdsl-vr9-app/Makefile +++ b/package/network/config/ltq-vdsl-vr9-app/Makefile @@ -9,7 +9,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ltq-vdsl-vr9-app PKG_VERSION:=4.17.18.6 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_BASE_NAME:=dsl_cpe_control PKG_SOURCE:=$(PKG_BASE_NAME)_vrx-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@OPENWRT diff --git a/package/network/config/ltq-vdsl-vr9-app/patches/200-autoboot.patch b/package/network/config/ltq-vdsl-vr9-app/patches/200-autoboot.patch index cc6feb94aa9f..d949162f5877 100644 --- a/package/network/config/ltq-vdsl-vr9-app/patches/200-autoboot.patch +++ b/package/network/config/ltq-vdsl-vr9-app/patches/200-autoboot.patch @@ -60,7 +60,7 @@ a state where an explicit start command is necessary to connect again. + { + DSL_CCA_DEBUG(DSL_CCA_DBG_ERR, (DSL_CPE_PREFIX + "Autoboot configuration for device (%d) failed!, nRet = %d!" -+ DSL_CPE_CRLF, nDevice, sAutobootCtl.accessCtl.nReturn)); ++ DSL_CPE_CRLF, nDevice, sAutobootCfg.accessCtl.nReturn)); + } + + memset(&sAutobootCtl, 0, sizeof(DSL_AutobootControl_t));