summaryrefslogtreecommitdiffstats
path: root/drivers/net/ppp
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-07-16 14:41:10 -0700
committerDavid S. Miller <davem@davemloft.net>2014-07-16 14:41:10 -0700
commited410ecf71a5924676ceb561f53a03119f27d925 (patch)
treed8db0a4ffa2ba2d32807597e9b30865e1cced7e8 /drivers/net/ppp
parent1a98c69af1ecd97bfd1f4e4539924a9192434e36 (diff)
parentbbbea41d5e53335fd81e89c728f71b14386f336e (diff)
Merge branch 'sctp-next'
Daniel Borkmann says: ==================== SCTP updates This set improves the SCTP socket API to be more in line with RFC6458, Geir and myself have finalized it eventually. While at it, the first patch also fixes two possible information leaks that should go to net tree as well (therefore the change is already here in net-next via a merge of the 'net' tree -DaveM). For more details, I refer you to the patches themselves. Thanks a lot. v1 -> v2: - Added 6th patch to deprecate SCTP_SNDRCV, rest unchanged ==================== CC: Jay Vosburgh <j.vosburgh@gmail.com> CC: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: Veaceslav Falico <vfalico@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ppp')
0 files changed, 0 insertions, 0 deletions