devlink: Fix phys_port_name of virtual port and merge error
Subsystems (2)
PATCH 1/1 devlink: Fix phys_port_name of virtual port and merge error
Merge commit cited in fixes tag was incorrect. Due to it phys_port_name of the virtual port resulted in incorrect name.
Also the phys_port_name of the physical port was written twice due to the merge error.
Fix it by removing the old code and inserting back the misplaced code.
Related commits of interest in net and net-next branches that resulted in merge conflict are:
in net-next branch:
commit f285f37cb1e6 ("devlink: append split port number to the port name")
in net branch:
commit b28d8f0c25a9 ("devlink: Correct VIRTUAL port to not have phys_port attributes")
--- net/core/devlink.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
net/core/devlink.c +2 -8
@@ -9343,18 +9343,10 @@ static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port,switch (attrs->flavour) {case DEVLINK_PORT_FLAVOUR_PHYSICAL : -case DEVLINK_PORT_FLAVOUR_VIRTUAL : n =snprintf (name, len,"p%u" , attrs->phys.port_number);if (n < len && attrs->split) n +=snprintf (name + n, len - n,"s%u" , attrs->phys.split_subport_number); -if (!attrs->split) - n =snprintf (name, len,"p%u" , attrs->phys.port_number); -else - n =snprintf (name, len,"p%us%u" , - attrs->phys.port_number, - attrs->phys.split_subport_number); -break ;case DEVLINK_PORT_FLAVOUR_CPU :case DEVLINK_PORT_FLAVOUR_DSA :
@@ -9396,6 +9388,8 @@ static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port, n =snprintf (name, len,"pf%usf%u" , attrs->pci_sf.pf, attrs->pci_sf.sf);break ; +case DEVLINK_PORT_FLAVOUR_VIRTUAL : +return -EOPNOTSUPP ; }if (n >= len)
Signature · 1 line
2.26.2
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 9 lines · On Fri, 23 Jul 2021 17:56:00 +0300 you wrote:
Merge commit cited in fixes tag was incorrect. Due to it
phys_port_nameof the virtual port resulted in incorrect name.Also the
phys_port_nameof the physical port was written twice due to the merge error.Fix it by removing the old code and inserting back the misplaced code.
[...]
Here is the summary with links:
- [net] devlink: Fix phys_port_name of virtual port and merge error
https://git.kernel.org/netdev/net/c/149ea30fdd5c
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html