Merge branch 'sctp-timestamp-fixes'
authorDavid S. Miller <davem@davemloft.net>
Sun, 6 Dec 2015 03:23:23 +0000 (22:23 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 6 Dec 2015 03:23:23 +0000 (22:23 -0500)
Marcelo Ricardo Leitner says:

====================
sctp: packet timestamp fixes

These a couple of fixes regarding sctp/packet timestamps.

Dmitry Vyukov <dvyukov@google.com> reported the counter leak on missing
net_enable_timestamp() (2nd patch) and further testing here revealed the
other two issues.

Please consider these to -stable.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge