diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-30 22:25:49 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-30 22:25:49 +0200 |
| commit | f139c74a8df071217dcd63f3ef06ae7be7071c4d (patch) | |
| tree | 5711f695577a18a06dbcd0101956e97b388ffa1a /net/sctp | |
| parent | net: mvpp2: implement ioctl() operation for PHY ioctls (diff) | |
| parent | Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux (diff) | |
| download | linux-f139c74a8df071217dcd63f3ef06ae7be7071c4d.tar.xz linux-f139c74a8df071217dcd63f3ef06ae7be7071c4d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/associola.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 9de23a222d3f..06a9ee6b2d3a 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c @@ -1097,6 +1097,7 @@ void sctp_assoc_update(struct sctp_association *asoc, asoc->c = new->c; asoc->peer.rwnd = new->peer.rwnd; asoc->peer.sack_needed = new->peer.sack_needed; + asoc->peer.auth_capable = new->peer.auth_capable; asoc->peer.i = new->peer.i; sctp_tsnmap_init(&asoc->peer.tsn_map, SCTP_TSN_MAP_INITIAL, asoc->peer.i.initial_tsn, GFP_ATOMIC); |