diff options
| author | Jakub Kicinski <[email protected]> | 2024-08-27 13:11:39 -0700 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-08-27 13:11:39 -0700 |
| commit | 2fecbf75c40aca51ae35accbaa6ea051bb2340c4 (patch) | |
| tree | 1843c88b7e4389cc5f9c255a14746df945419649 /include | |
| parent | 65a3cce43d5b4c53cf16b0be1a03991f665a0806 (diff) | |
| parent | 2aeeef906d5a526dc60cf4af92eda69836c39b1f (diff) | |
Merge branch 'fixes-for-ipsec-over-bonding'
Jianbo Liu says:
====================
Fixes for IPsec over bonding
This patchset provides bug fixes for IPsec over bonding driver.
It adds the missing xdo_dev_state_free API, and fixes "scheduling while
atomic" by using mutex lock instead.
Series generated against:
commit c07ff8592d57 ("netem: fix return value if duplicate enqueue fails")
====================
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bonding.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bonding.h b/include/net/bonding.h index b61fb1aa3a56..8bb5f016969f 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h @@ -260,7 +260,7 @@ struct bonding { #ifdef CONFIG_XFRM_OFFLOAD struct list_head ipsec_list; /* protecting ipsec_list */ - spinlock_t ipsec_lock; + struct mutex ipsec_lock; #endif /* CONFIG_XFRM_OFFLOAD */ struct bpf_prog *xdp_prog; }; |