| Message ID | 20210816100828.29252-1-atenart@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1b3f78df6a80932d7deb0155d8b0871e8d3e4bca |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] bonding: improve nl error msg when device can't be enslaved because of IFF_MASTER | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 6 of 6 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 3 this patch: 3 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 3 this patch: 3 |
| netdev/header_inline | success | Link |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Mon, 16 Aug 2021 12:08:28 +0200 you wrote: > Use a more user friendly netlink error message when a device can't be > enslaved because it has IFF_MASTER, by not referring directly to a > kernel internal flag. > > Signed-off-by: Antoine Tenart <atenart@kernel.org> > --- > drivers/net/bonding/bond_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Here is the summary with links: - [net-next] bonding: improve nl error msg when device can't be enslaved because of IFF_MASTER https://git.kernel.org/netdev/net-next/c/1b3f78df6a80 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 04158a8368e4..b0966e733926 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1759,7 +1759,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, if (slave_dev->flags & IFF_MASTER && !netif_is_bond_master(slave_dev)) { BOND_NL_ERR(bond_dev, extack, - "Device with IFF_MASTER cannot be enslaved"); + "Device type (master device) cannot be enslaved"); return -EPERM; }
Use a more user friendly netlink error message when a device can't be enslaved because it has IFF_MASTER, by not referring directly to a kernel internal flag. Signed-off-by: Antoine Tenart <atenart@kernel.org> --- drivers/net/bonding/bond_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)