git: 828445cc5e18 - main - if_vlan: set if_cap{abilities2,enable2} after IFCAP_IPSEC_OFFLOAD is recalculated

[Konstantin Belousov]

The branch main has been updated by kib:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=828445cc5e18b678ff032325a8dadc59b9bfbea6

commit 828445cc5e18b678ff032325a8dadc59b9bfbea6
Author:     Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2024-08-20 22:20:49 +0000
Commit:     Konstantin Belousov <k...@freebsd.org>
CommitDate: 2024-08-21 10:31:41 +0000

    if_vlan: set if_cap{abilities2,enable2} after IFCAP_IPSEC_OFFLOAD is 
recalculated
    
    This makes the vlan IPSEC offload really functional.
    
    Noted by:       Ariel Ehrenberg <aehrenb...@nvidia.com>
    Sponsored by:   NVidia networking
---
 sys/net/if_vlan.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 45489138fdef..a30db9173383 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -2210,8 +2210,6 @@ vlan_capabilities(struct ifvlan *ifv)
 
        ifp->if_capabilities = cap;
        ifp->if_capenable = ena;
-       ifp->if_capabilities2 = cap2;
-       ifp->if_capenable2 = ena2;
        ifp->if_hwassist = hwa;
 
 #ifdef IPSEC_OFFLOAD
@@ -2219,6 +2217,9 @@ vlan_capabilities(struct ifvlan *ifv)
        ena2 |= mena2 & IFCAP2_BIT(IFCAP2_IPSEC_OFFLOAD);
        ifp->if_ipsec_accel_m = &vlan_if_ipsec_accel_methods;
 #endif
+
+       ifp->if_capabilities2 = cap2;
+       ifp->if_capenable2 = ena2;
 }
 
 static void