diff options
| author | Thomas Zimmermann | 2021-07-27 14:08:29 +0200 |
|---|---|---|
| committer | Thomas Zimmermann | 2021-07-27 14:08:29 +0200 |
| commit | 8ee18e769dd621104fecad584c84ec3c4c9ef3fa (patch) | |
| tree | ec7db1631faeb9c5998924b29aa246cbb4a38517 /net/sctp/auth.c | |
| parent | 44379b986424b02acfa6e8c85ec5d68d89d3ccc4 (diff) | |
| parent | ff1176468d368232b684f75e82563369208bc371 (diff) | |
Merge drm/drm-fixes into drm-misc-fixes
Backmerging to get tree to v5.14-rc3, as requested by Daniel.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'net/sctp/auth.c')
| -rw-r--r-- | net/sctp/auth.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sctp/auth.c b/net/sctp/auth.c index 6f8319b828b0..fe74c5f95630 100644 --- a/net/sctp/auth.c +++ b/net/sctp/auth.c @@ -860,6 +860,8 @@ int sctp_auth_set_key(struct sctp_endpoint *ep, if (replace) { list_del_init(&shkey->key_list); sctp_auth_shkey_release(shkey); + if (asoc && asoc->active_key_id == auth_key->sca_keynumber) + sctp_auth_asoc_init_active_key(asoc, GFP_KERNEL); } list_add(&cur_key->key_list, sh_keys); |