39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
|
From 6a8e030c0a8481e42ee60a52e7a91f736537f5e3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lukas Nykryn <lnykryn@redhat.com>
|
||
|
|
Date: Thu, 22 Aug 2024 14:31:54 +0200
|
||
|
|
Subject: [PATCH] net-naming-scheme: remove NAMING_FIRMWARE_NODE_SUN from 9.5
|
||
|
|
|
||
|
|
rhel-only: policy
|
||
|
|
Resolves: RHEL-55728
|
||
|
|
---
|
||
|
|
man/systemd.net-naming-scheme.xml | 2 --
|
||
|
|
src/shared/netif-naming-scheme.h | 2 +-
|
||
|
|
2 files changed, 1 insertion(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml
|
||
|
|
index 8be24e4243..246c6509e3 100644
|
||
|
|
--- a/man/systemd.net-naming-scheme.xml
|
||
|
|
+++ b/man/systemd.net-naming-scheme.xml
|
||
|
|
@@ -604,8 +604,6 @@
|
||
|
|
children of the same PCI bridge, e.g. there are multiple PCI bridges in the same slot.
|
||
|
|
</para>
|
||
|
|
|
||
|
|
- <para>PCI slot number is now read from <constant>firmware_node/sun</constant> sysfs file.</para>
|
||
|
|
-
|
||
|
|
<xi:include href="version-info.xml" xpointer="rhel-9.5"/>
|
||
|
|
</listitem>
|
||
|
|
</varlistentry>
|
||
|
|
diff --git a/src/shared/netif-naming-scheme.h b/src/shared/netif-naming-scheme.h
|
||
|
|
index fb733ba768..b2b2ee648f 100644
|
||
|
|
--- a/src/shared/netif-naming-scheme.h
|
||
|
|
+++ b/src/shared/netif-naming-scheme.h
|
||
|
|
@@ -81,7 +81,7 @@ typedef enum NamingSchemeFlags {
|
||
|
|
NAMING_RHEL_9_2 = NAMING_RHEL_9_0,
|
||
|
|
NAMING_RHEL_9_3 = NAMING_RHEL_9_0 | NAMING_SR_IOV_R,
|
||
|
|
NAMING_RHEL_9_4 = NAMING_RHEL_9_3,
|
||
|
|
- NAMING_RHEL_9_5 = (NAMING_RHEL_9_4 & ~NAMING_BRIDGE_MULTIFUNCTION_SLOT) | NAMING_FIRMWARE_NODE_SUN,
|
||
|
|
+ NAMING_RHEL_9_5 = NAMING_RHEL_9_4 & ~NAMING_BRIDGE_MULTIFUNCTION_SLOT,
|
||
|
|
|
||
|
|
NAMING_RHEL_10_0_BETA = NAMING_V255,
|
||
|
|
|