diff options
| author | Jan Engelmohr <jan.engelmohr@mailbox.tu-dresden.de> | 2016-07-26 18:07:05 +0200 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2016-08-26 15:59:30 +0200 |
| commit | a2904e3eed56216fe65091d9b3638ae1f90e43fa (patch) | |
| tree | 2d33c26327fde2201600aaec2ac4ae84dbe16499 /net/sctp | |
| parent | c185b77b187a5b9af6fcfaaa5486c52cd902b1d1 (diff) | |
3.10.69 -> 3.10.70
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/associola.c | 1 | ||||
| -rw-r--r-- | net/sctp/sm_make_chunk.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index ca4a1a1b8..6360a14ed 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c @@ -1297,7 +1297,6 @@ void sctp_assoc_update(struct sctp_association *asoc, asoc->peer.peer_hmacs = new->peer.peer_hmacs; new->peer.peer_hmacs = NULL; - sctp_auth_key_put(asoc->asoc_shared_key); sctp_auth_asoc_init_active_key(asoc, GFP_ATOMIC); } diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 29fc16f36..beedadf62 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c @@ -2595,7 +2595,7 @@ do_addr_param: addr_param = param.v + sizeof(sctp_addip_param_t); - af = sctp_get_af_specific(param_type2af(param.p->type)); + af = sctp_get_af_specific(param_type2af(addr_param->p.type)); if (af == NULL) break; |