From patchwork Sat Aug 7 13:58:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qingfang Deng X-Patchwork-Id: 1514682 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: 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=eSV9n1Pl; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=JgRk6/0e; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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 ozlabs.org (Postfix) with ESMTPS id 4GhkXW4tpwz9sRK for ; Sun, 8 Aug 2021 00:01:14 +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:Message-Id:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=MeCfOGgCL3CThh7573zopJywUZmcsaMGMM3ziUAZV7U=; b=eSV9n1PlkRjr4S s/5Z+0OoGpyghQUXvfIYumpq12MOvqVk0quwCZ8ZnWkuUtaFA8TMyO6QtMDv869BsEhFh8TLZinu2 I33qh3+wbgdqeOS5pxA1YKlJxAxTrOzpJs/cyc24CEy0oFeoyGchRDyFamndK2F8f8cgIdF4kMH8y pRd0+lVU7B0+niC4Pb3RcPhInoNYVsMUZ3cqoY4pIVGPQSxTAP4z/E+yYFC8rxut0lhZKzPivhHgV TjEle2Zzt0WObv7rV/tDa99LcqzVZogWITCRD9VtV0nNs+Dzs/Yd0XM6DMwice9LP0a4FRdle9ReE rexV4L2T+KeYSXPym9RA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mCMqN-00EqaT-2m; Sat, 07 Aug 2021 13:58:31 +0000 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mCMqJ-00Eqa6-M7 for openwrt-devel@lists.openwrt.org; Sat, 07 Aug 2021 13:58:29 +0000 Received: by mail-pj1-x102e.google.com with SMTP id lw7-20020a17090b1807b029017881cc80b7so895244pjb.3 for ; Sat, 07 Aug 2021 06:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=FJ6aNsY0cEvz6AQqRJkEe90XJxTmQZLDq3Lh/BsnGbE=; b=JgRk6/0e0mjSB20Ceh7XYQ+NA1/RmsbN6NTd9LBzeCPDV3uBprWvcowYm07/OFWGMy 7A0qkmWYDyn7B2f+uhzzTHAcDfmMZ05MuoaNlknSFIzgSgprCKC2OtnNKhUF2O9Oo8py FSiIa4l/2AdrXOw+IWERbFaIRmVRdihuk+oUPdI4nK/pIV6kSV5U9us3CoNvTKpbG5tR fnMXImsAEsLqLqz0bsCZmMadllVryLEa9n6ljYUxImNMmWRd3CfKxs+L8ZrFjUqNKOYD kFg5kC306+azzlZ5dNbf7CdKiD+ipsXWU6WZOp3+k7L7ih5N+3Eprz9rpS+LUxHBlNWY Z79Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=FJ6aNsY0cEvz6AQqRJkEe90XJxTmQZLDq3Lh/BsnGbE=; b=oJg4SgsazkpaIW77nctcyxYhvSU3q3bmI3w92kEX8ftdcsnpbHlmVX36ada6zwMlKH MBvdMaPq6AHJKWHcjk0Xg2yt6zwjQ6GlIeW8gUFvyqs0WbcU2kTUTz+DlQyUcrqrNdUR A8+0b3i37QZHQ84rRhRo4GLrrMpIvs5fFu/QrFxxM87xJLOr3NbQ3YTsNJ6EuGI6/OPw epbbXcqOmW0+Jtn3fEP111msG8Vdt5j+lwTlpNlWRlZQEZKi2W6YQ+g9U5W8m/47tFJ3 2HYYTQjPRHQnHShH7ZTmCbF4JM1T3W07/Kf1/e7R0yJQA8WGZ/QDCCICOXHVd3JqRDuU UFiA== X-Gm-Message-State: AOAM5313ykTUc7FLRSvsjm0jYfDmoRgOvtyfo/b8e+uubRAdn/QIKWEo YtLSnNQcCGaa1pfQ79c+WGIk9rwHZx3Z6oe8 X-Google-Smtp-Source: ABdhPJy4jQexg9tTBosF+E23pwDeN1E1+NedGdh2nUDoAqds7ZPgMCPnSLsFugrBvB5K2TsRcUdLcg== X-Received: by 2002:a63:6f8c:: with SMTP id k134mr237114pgc.35.1628344704805; Sat, 07 Aug 2021 06:58:24 -0700 (PDT) Received: from haswell-ubuntu20.lan ([138.197.212.246]) by smtp.gmail.com with ESMTPSA id g3sm13391262pfi.197.2021.08.07.06.58.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Aug 2021 06:58:24 -0700 (PDT) From: DENG Qingfang To: openwrt-devel@lists.openwrt.org Subject: [PATCH] mvebu: cortexa9: remove wifi migration script Date: Sat, 7 Aug 2021 21:58:17 +0800 Message-Id: <20210807135817.1075035-1-dqfext@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210807_065827_785761_E8E0C75F X-CRM114-Status: GOOD ( 10.57 ) X-Spam-Score: -0.2 (/) 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: As we can't upgrade to 21.02 while keeping config anyway, remove the migration script. Signed-off-by: DENG Qingfang --- .../ieee80211/00-wifi-config-migrate | 41 1 file changed, 41 deletions(-) delete mode 100644 target/linux/mvebu/cortexa9/base-files/etc/hotplug.d [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:102e listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [dqfext[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 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 As we can't upgrade to 21.02 while keeping config anyway, remove the migration script. Signed-off-by: DENG Qingfang --- .../ieee80211/00-wifi-config-migrate | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 target/linux/mvebu/cortexa9/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate diff --git a/target/linux/mvebu/cortexa9/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate b/target/linux/mvebu/cortexa9/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate deleted file mode 100644 index a8173b3117..0000000000 --- a/target/linux/mvebu/cortexa9/base-files/etc/hotplug.d/ieee80211/00-wifi-config-migrate +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -# The pcie-controller device was renamed to pcie in Linux kernel 4.14 -# commit 28fbb9c539e2 ("ARM: dts: marvell: fix PCI bus dtc warnings"). -# This script migrates the path in the UCI configuration from the old -# name to the new name and also back, when am upgrade or downgrade is -# done. It checks if the name exists before changing the configuration. -# This has to be done before the 10-wifi-detect script from mac80211 is -# executed because this would add the devices again under the new path -# name. - -. /lib/functions.sh - -PATH_CHANGED=0 - -rename_wifi_path() { - local path_old=$(uci get wireless.${1}.path) - local path_new=$(echo ${path_old} | sed "${2}") - - if [ -e "/sys/devices/platform/${path_new}" ] && [ ${path_old} != ${path_new} ] - then - uci set wireless.${1}.path=${path_new} - PATH_CHANGED=1 - fi -} - -rename_wifi_path_list() { - # migration from kernel 4.9 to 4.14 - rename_wifi_path $1 "s/soc:pcie-controller/soc:pcie/" - # migration from kernel 4.14 to 4.9 - rename_wifi_path $1 "s/soc:pcie/soc:pcie-controller/" -} - -[ "${ACTION}" = "add" ] && { - [ ! -e /etc/config/wireless ] && return - - config_load wireless - config_foreach rename_wifi_path_list wifi-device - - [ "$PATH_CHANGED" = "1" ] && uci commit wireless -}