This error message can be triggered by userspace. Use NL_SET_ERR_MSG so
the message is returned to the user and to avoid polluting the kernel
logs. Additionally, change the return value from EFAULT to EBUSY to
better reflect the error (which has nothing to do with addressing).
Signed-off-by: Sean Anderson <[email protected]>
---
Changes in v2:
- Split off from stats series
- Document return value change
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index c29809cd9201..5f98daa5b341 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -1945,9 +1945,9 @@ axienet_ethtools_set_coalesce(struct net_device *ndev,
struct axienet_local *lp = netdev_priv(ndev);
if (netif_running(ndev)) {
- netdev_err(ndev,
- "Please stop netif before applying configuration\n");
- return -EFAULT;
+ NL_SET_ERR_MSG(extack,
+ "Please stop netif before applying configuration");
+ return -EBUSY;
}
if (ecoalesce->rx_max_coalesced_frames)
--
2.35.1.1320.gc452695387.dirty
On Tue, Jun 11, 2024 at 11:41:16AM -0400, Sean Anderson wrote:
> This error message can be triggered by userspace. Use NL_SET_ERR_MSG so
> the message is returned to the user and to avoid polluting the kernel
> logs. Additionally, change the return value from EFAULT to EBUSY to
> better reflect the error (which has nothing to do with addressing).
>
> Signed-off-by: Sean Anderson <[email protected]>
Reviewed-by: Andrew Lunn <[email protected]>
Andrew
> -----Original Message-----
> From: Sean Anderson <[email protected]>
> Sent: Tuesday, June 11, 2024 9:11 PM
> To: Pandey, Radhey Shyam <[email protected]>; Andrew
> Lunn <[email protected]>; [email protected]
> Cc: Jakub Kicinski <[email protected]>; [email protected]; Russell
> King <[email protected]>; Simek, Michal <[email protected]>;
> Paolo Abeni <[email protected]>; Eric Dumazet <[email protected]>;
> David S . Miller <[email protected]>; linux-arm-
> [email protected]; Sean Anderson <[email protected]>
> Subject: [PATCH net-next v2] net: xilinx: axienet: Use NL_SET_ERR_MSG
> instead of netdev_err
>
> This error message can be triggered by userspace. Use NL_SET_ERR_MSG so
> the message is returned to the user and to avoid polluting the kernel
> logs. Additionally, change the return value from EFAULT to EBUSY to
> better reflect the error (which has nothing to do with addressing).
>
> Signed-off-by: Sean Anderson <[email protected]>
Reviewed-by: Radhey Shyam Pandey <[email protected]>
Thanks!
> ---
>
> Changes in v2:
> - Split off from stats series
> - Document return value change
>
> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> index c29809cd9201..5f98daa5b341 100644
> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> @@ -1945,9 +1945,9 @@ axienet_ethtools_set_coalesce(struct net_device
> *ndev,
> struct axienet_local *lp = netdev_priv(ndev);
>
> if (netif_running(ndev)) {
> - netdev_err(ndev,
> - "Please stop netif before applying
> configuration\n");
> - return -EFAULT;
> + NL_SET_ERR_MSG(extack,
> + "Please stop netif before applying
> configuration");
> + return -EBUSY;
> }
>
> if (ecoalesce->rx_max_coalesced_frames)
> --
> 2.35.1.1320.gc452695387.dirty
Hello:
This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <[email protected]>:
On Tue, 11 Jun 2024 11:41:16 -0400 you wrote:
> This error message can be triggered by userspace. Use NL_SET_ERR_MSG so
> the message is returned to the user and to avoid polluting the kernel
> logs. Additionally, change the return value from EFAULT to EBUSY to
> better reflect the error (which has nothing to do with addressing).
>
> Signed-off-by: Sean Anderson <[email protected]>
>
> [...]
Here is the summary with links:
- [net-next,v2] net: xilinx: axienet: Use NL_SET_ERR_MSG instead of netdev_err
https://git.kernel.org/netdev/net-next/c/32b06603f879
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html