| Message ID | 20210526095747.22446-7-tariqt@nvidia.com (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | BOND TLS flags fixes | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 3 maintainers not CCed: vfalico@gmail.com andy@greyhouse.net j.vosburgh@gmail.com |
| 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: 5 this patch: 5 |
| 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, 10 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 5 this patch: 5 |
| netdev/header_inline | success | Link |
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 34a72981df38..3c9466e6114a 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1229,9 +1229,7 @@ static netdev_features_t bond_fix_features(struct net_device *dev, struct slave *slave; #if IS_ENABLED(CONFIG_TLS_DEVICE) - if (bond_sk_check(bond)) - features |= BOND_TLS_FEATURES; - else + if (!bond_sk_check(bond) && (features & BOND_TLS_FEATURES)) features &= ~BOND_TLS_FEATURES; #endif
There is no more need to enforce TLS features in bond_fix_features() when supported, as they became explicitly controllable for a bond interface. Fixes: 89df6a810470 ("net/bonding: Implement TLS TX device offload") Signed-off-by: Tariq Toukan <tariqt@nvidia.com> --- drivers/net/bonding/bond_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)