git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sfrench/cifs-2.6.git]
/
net
/
sctp
/
associola.c
diff --git
a/net/sctp/associola.c
b/net/sctp/associola.c
index 685c7ef11eb4a387c5f550f46bea389ba2145ee4..201c888604e403123cf5ab5defe7a75387828886 100644
(file)
--- a/
net/sctp/associola.c
+++ b/
net/sctp/associola.c
@@
-118,9
+118,6
@@
static struct sctp_association *sctp_association_init(
asoc->flowlabel = sp->flowlabel;
asoc->dscp = sp->dscp;
asoc->flowlabel = sp->flowlabel;
asoc->dscp = sp->dscp;
- /* Initialize default path MTU. */
- asoc->pathmtu = sp->pathmtu;
-
/* Set association default SACK delay */
asoc->sackdelay = msecs_to_jiffies(sp->sackdelay);
asoc->sackfreq = sp->sackfreq;
/* Set association default SACK delay */
asoc->sackdelay = msecs_to_jiffies(sp->sackdelay);
asoc->sackfreq = sp->sackfreq;
@@
-254,6
+251,10
@@
static struct sctp_association *sctp_association_init(
0, gfp))
goto fail_init;
0, gfp))
goto fail_init;
+ /* Initialize default path MTU. */
+ asoc->pathmtu = sp->pathmtu;
+ sctp_assoc_update_frag_point(asoc);
+
/* Assume that peer would support both address types unless we are
* told otherwise.
*/
/* Assume that peer would support both address types unless we are
* told otherwise.
*/
@@
-436,7
+437,7
@@
static void sctp_association_destroy(struct sctp_association *asoc)
WARN_ON(atomic_read(&asoc->rmem_alloc));
WARN_ON(atomic_read(&asoc->rmem_alloc));
- kfree
(asoc
);
+ kfree
_rcu(asoc, rcu
);
SCTP_DBG_OBJCNT_DEC(assoc);
}
SCTP_DBG_OBJCNT_DEC(assoc);
}