1. 17 Jul, 2014 38 commits
  2. 16 Jul, 2014 2 commits
    • Christoph Schulz's avatar
      net: ppp: access ppp->nextseq only if CONFIG_PPP_MULTILINK is defined · a9f559c3
      Christoph Schulz authored
      Commit d762d038 resets the counter holding the
      next sequence number for multilink PPP fragments to zero whenever the
      SC_MULTILINK flag is set. However, this counter only exists if
      CONFIG_PPP_MULTILINK is defined. Consequently, the new code has to be enclosed
      within #ifdef CONFIG_PPP_MULTILINK ... #endif.
      Signed-off-by: default avatarChristoph Schulz <develop@kristov.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a9f559c3
    • David S. Miller's avatar
      Merge branch 'sctp-next' · ed410ecf
      David S. Miller authored
      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: default avatarVeaceslav Falico <vfalico@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ed410ecf