Skip to content

Commit adcaf2e

Browse files
committed
Merge: bonding: delete always true device check
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/629 JIRA: https://issues.redhat.com/browse/RHEL-84541 Upstream Status: net.git commit 546d983 commit 546d983 Author: Leon Romanovsky <leon@kernel.org> Date: Mon Feb 3 14:59:23 2025 +0200 bonding: delete always true device check XFRM API makes sure that xs->xso.dev is valid in all XFRM offload callbacks. There is no need to check it again. Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Acked-by: Paolo Abeni <pabeni@redhat.com> Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org> Link: https://patch.msgid.link/0b2f8f5f09701bb43bbd83b94bfe5cb506b57adc.1738587150.git.leon@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Hangbin Liu <haliu@redhat.com> Approved-by: Florian Westphal <fwestpha@redhat.com> Approved-by: Xin Long <lxin@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Julio Faracco <jfaracco@redhat.com>
2 parents 49d2dc2 + 1c6c2e0 commit adcaf2e

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

drivers/net/bonding/bond_main.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,9 +432,6 @@ static struct net_device *bond_ipsec_dev(struct xfrm_state *xs)
432432
struct bonding *bond;
433433
struct slave *slave;
434434

435-
if (!bond_dev)
436-
return NULL;
437-
438435
bond = netdev_priv(bond_dev);
439436
if (BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP)
440437
return NULL;

0 commit comments

Comments
 (0)