summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2025-08-13 17:31:46 -0700
committerJakub Kicinski <kuba@kernel.org>2025-08-13 17:31:46 -0700
commit212122775ea78ffe0508ee7ed08a9c2b980f09e2 (patch)
tree5cf672b1c8a79afdad4bc53e59e26e4396718892 /net
parent39f8fcda2088382a4aa70b258d6f7225aa386f11 (diff)
parente67a0bc3ed4fd8ee1697cb6d937e2b294ec13b5e (diff)
downloadlinux-212122775ea78ffe0508ee7ed08a9c2b980f09e2.tar.gz
linux-212122775ea78ffe0508ee7ed08a9c2b980f09e2.zip
Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue
Tony Nguyen says: ==================== ixgbe: bypass devlink phys_port_name generation Jedrzej adds option to skip phys_port_name generation and opts ixgbe into it as some configurations rely on pre-devlink naming which could end up broken as a result. * '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue: ixgbe: prevent from unwanted interface name changes devlink: let driver opt out of automatic phys_port_name generation ==================== Link: https://patch.msgid.link/20250812205226.1984369-1-anthony.l.nguyen@intel.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net')
-rw-r--r--net/devlink/port.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/devlink/port.c b/net/devlink/port.c
index 939081a0e615..cb8d4df61619 100644
--- a/net/devlink/port.c
+++ b/net/devlink/port.c
@@ -1519,7 +1519,7 @@ static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port,
struct devlink_port_attrs *attrs = &devlink_port->attrs;
int n = 0;
- if (!devlink_port->attrs_set)
+ if (!devlink_port->attrs_set || devlink_port->attrs.no_phys_port_name)
return -EOPNOTSUPP;
switch (attrs->flavour) {