From patchwork Fri Oct 27 18:27:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1856385 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SHB4B6TYVz23jP for ; Sat, 28 Oct 2023 05:28:10 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qwRYu-0001zV-Hz; Fri, 27 Oct 2023 18:28:00 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qwRYS-0001qk-2Q for kernel-team@lists.ubuntu.com; Fri, 27 Oct 2023 18:27:36 +0000 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id D28503FD43 for ; Fri, 27 Oct 2023 18:27:30 +0000 (UTC) Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-408597a1ae3so18031195e9.0 for ; Fri, 27 Oct 2023 11:27:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698431250; x=1699036050; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZrdPGK7g/PY3ODRNpwffDzhI0TwE7QR45Uu1IaEJ4hg=; b=CIPM7Bm1MOZqeHqts36JWsNMODLqfnppoNpym0SLlrVxH6zRDsmi2trvalMoo2mN66 9nVSDgN88eyMuRzA9g3TuDUjFgNwSp0njdMZMnxHLV46PRu/sYbi8LYkA2rD2gCiftkz 3sOGtUVAszPKrRMGXXXduH02lWpa6Ff5YT/isdL4FbBawrh/HtAkaN+bpSyyNIVmwKzY 5L8OSfjrZv9Z7llKzWgON1bIBY6mxhrhdVI/DWyXT8XaYCzTy2O1XAPrbX5I3nC/5HWn zaDgKh5McTsoSCEGvwTqWJDSaZh+0EDceQPLpdGJy7oCe96b93hv6CvwLustiN9wl3Yj 8Vcg== X-Gm-Message-State: AOJu0Yywpzj6zG2rjhZgNSQnE8eFbRdkeZJOLLzxZXAu13dXDJlUv66a V7OcTCAhHn2Dt83LkWU1+aVKnHh+lT8u7SlOOjiRsb7oeJeu7csAistO7R8AAFn7S/3rgYMev1g kCOCqtEsYdow3Cu3aKj8Q6eNiOBiRqINw5nvtDpp/sNRGIGPebQ== X-Received: by 2002:a05:600c:3786:b0:408:364e:34a2 with SMTP id o6-20020a05600c378600b00408364e34a2mr3064714wmr.10.1698431250534; Fri, 27 Oct 2023 11:27:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFQ6MZE8LiE5FXAp5wPF38dTHBX/cdAAnaVqnKX28pBtacHRQJ2Gsw7ci+saTIle4Thlv4QcA== X-Received: by 2002:a05:600c:3786:b0:408:364e:34a2 with SMTP id o6-20020a05600c378600b00408364e34a2mr3064699wmr.10.1698431250113; Fri, 27 Oct 2023 11:27:30 -0700 (PDT) Received: from localhost ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id h8-20020adff4c8000000b00318147fd2d3sm2267226wrp.41.2023.10.27.11.27.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 11:27:29 -0700 (PDT) From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][M:meta-laptop][PATCH] UBUNTU: Set persistent wifi MAC address Date: Fri, 27 Oct 2023 20:27:29 +0200 Message-Id: <20231027182729.52300-1-juerg.haefliger@canonical.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/2039144 The X13s comes up with a random wifi MAC address, because it's hidden probably in secret storage that the kernel can't get to (yet). This can be problematic for some environments and MAC address randomization should really be handled by NetworkManager. So set a unique and persistent MAC based on /etc/machine-id. Signed-off-by: Juerg Haefliger Acked-by: Dimitri John Ledkov Acked-by: Thibault Ferrante Acked-by: Manuel Diewald --- rules.d/60-laptop-persistent-wifi-mac.rules | 2 ++ share/set-wifi-mac-addr | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 rules.d/60-laptop-persistent-wifi-mac.rules create mode 100755 share/set-wifi-mac-addr diff --git a/rules.d/60-laptop-persistent-wifi-mac.rules b/rules.d/60-laptop-persistent-wifi-mac.rules new file mode 100644 index 000000000000..e667f9d13f3a --- /dev/null +++ b/rules.d/60-laptop-persistent-wifi-mac.rules @@ -0,0 +1,2 @@ +# Set wifi MAC on X13s +SUBSYSTEM=="net", ACTION=="add", ATTRS{vendor}=="0x17cb", ATTRS{device}=="0x1103", PROGRAM="/usr/share/linux-laptop/set-wifi-mac-addr %k" diff --git a/share/set-wifi-mac-addr b/share/set-wifi-mac-addr new file mode 100755 index 000000000000..1b56e22e5638 --- /dev/null +++ b/share/set-wifi-mac-addr @@ -0,0 +1,16 @@ +#!/bin/sh +# +# Set X13s wifi MAC address +# + +intf=${1} + +# Bytes 2-4 from /etc/machine-id +nic=$(sed 's/\(..\)/\1:/g' /etc/machine-id | cut -c 4-11) + +# Qualcomm OUI +oui="8c:fd:f0" + +mac="${oui}:${nic}" +echo "Set MAC addr of ${intf} to ${mac}" +/bin/ip link set "${intf}" address "${mac}"