sctp pull request for net-next-2.6

sctp pull request for net-next-2.6

[Vlad Yasevich]

Hi David

The following changes since commit 83d7eb2979cd3390c375470225dd2d8f2009bc70:
  Dan Carpenter (1):
        ipv6: cleanup: remove unneeded null check

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev.git net-next

Dan Carpenter (1):
      sctp: cleanup: remove duplicate assignment

Shan Wei (1):
      sctp: use sctp_chunk_is_data macro to decide a chunk is data chunk

Vlad Yasevich (13):
      sctp: Use correct address family in sctp_getsockopt_peer_addrs()
      sctp: send SHUTDOWN-ACK chunk back to the source.
      sctp: Do no select unconfirmed transports for retransmissions
      sctp: Make sure we always return valid retransmit path
      sctp: remove 'resent' bit from the chunk
      sctp: Do not force T3 timer on fast retransmissions.
      sctp: Save some room in the sctp_transport by using bitfields
      sctp: update transport initializations
      sctp: fast recovery algorithm is per association.
      sctp: rwnd_press should be cumulative
      sctp: correctly mark missing chunks in fast recovery
      sctp: Optimize computation of highest new tsn in SACK.
      sctp: Tag messages that can be Nagle delayed at creation.

Wei Yongjun (5):
      sctp: assure at least one T3-rtx timer is running if a FORWARD TSN is sent
      sctp: discard ABORT chunk with zero verification tag in COOKIE-WAIT state
      sctp: missing set src and dest port while lookup output route
      sctp: fix to retranmit at least one DATA chunk
      sctp: implement sctp association probing module

 include/net/sctp/sctp.h    |    2 +-
 include/net/sctp/sm.h      |    2 +-
 include/net/sctp/structs.h |   66 +++++++-------
 net/sctp/Kconfig           |   12 +++
 net/sctp/Makefile          |    3 +
 net/sctp/associola.c       |   13 ++--
 net/sctp/chunk.c           |    4 +-
 net/sctp/endpointola.c     |    2 -
 net/sctp/output.c          |   27 ++----
 net/sctp/outqueue.c        |   94 +++++++++-----------
 net/sctp/probe.c           |  213 ++++++++++++++++++++++++++++++++++++++++++++
 net/sctp/protocol.c        |    7 ++-
 net/sctp/sm_make_chunk.c   |   24 ++---
 net/sctp/sm_sideeffect.c   |    8 ++-
 net/sctp/socket.c          |    2 +-
 net/sctp/transport.c       |   61 ++++---------
 16 files changed, 364 insertions(+), 176 deletions(-)
 create mode 100644 net/sctp/probe.c


Please pull.
Thanks a lot
-vlad

Re: sctp pull request for net-next-2.6

[David Miller]

From: Vlad Yasevich <vladislav.yasevich@hp.com>
Date: Fri, 30 Apr 2010 22:52:39 -0400

> The following changes since commit 83d7eb2979cd3390c375470225dd2d8f2009bc70:
>   Dan Carpenter (1):
>         ipv6: cleanup: remove unneeded null check
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev.git net-next

Pulled, thanks Vlad.

Re: sctp pull request for net-next-2.6

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Mon, 03 May 2010 16:21:48 -0700 (PDT)

> From: Vlad Yasevich <vladislav.yasevich@hp.com>
> Date: Fri, 30 Apr 2010 22:52:39 -0400
> 
>> The following changes since commit 83d7eb2979cd3390c375470225dd2d8f2009bc70:
>>   Dan Carpenter (1):
>>         ipv6: cleanup: remove unneeded null check
>> 
>> are available in the git repository at:
>> 
>>   git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev.git net-next
> 
> Pulled, thanks Vlad.

I had to fix the build when I merged this by adding a missing
linux/vmalloc.h include to net/sctp/probe.c

net/sctp/probe.c: In function ‘sctpprobe_read’:
net/sctp/probe.c:97: error: implicit declaration of function ‘vmalloc’
net/sctp/probe.c:97: warning: assignment makes pointer from integer without a cast
net/sctp/probe.c:110: error: implicit declaration of function ‘vfree’

diff --git a/net/sctp/probe.c b/net/sctp/probe.c
index 8f025d5..db3a42b 100644
--- a/net/sctp/probe.c
+++ b/net/sctp/probe.c
@@ -27,6 +27,7 @@
 #include <linux/socket.h>
 #include <linux/sctp.h>
 #include <linux/proc_fs.h>
+#include <linux/vmalloc.h>
 #include <linux/module.h>
 #include <linux/kfifo.h>
 #include <linux/time.h>

Re: sctp pull request for net-next-2.6

[Vlad Yasevich]

David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Mon, 03 May 2010 16:21:48 -0700 (PDT)
> 
>> From: Vlad Yasevich <vladislav.yasevich@hp.com>
>> Date: Fri, 30 Apr 2010 22:52:39 -0400
>>
>>> The following changes since commit 83d7eb2979cd3390c375470225dd2d8f2009bc70:
>>>   Dan Carpenter (1):
>>>         ipv6: cleanup: remove unneeded null check
>>>
>>> are available in the git repository at:
>>>
>>>   git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev.git net-next
>> Pulled, thanks Vlad.
> 
> I had to fix the build when I merged this by adding a missing
> linux/vmalloc.h include to net/sctp/probe.c
> 
> net/sctp/probe.c: In function ‘sctpprobe_read’:
> net/sctp/probe.c:97: error: implicit declaration of function ‘vmalloc’
> net/sctp/probe.c:97: warning: assignment makes pointer from integer without a cast
> net/sctp/probe.c:110: error: implicit declaration of function ‘vfree’
> 

I feel sheeepish.  I just checked my config and realized this thing wasn't
turned on (my guess it got turned off by the stable builds...).  Sorry about that.

-vlad

> diff --git a/net/sctp/probe.c b/net/sctp/probe.c
> index 8f025d5..db3a42b 100644
> --- a/net/sctp/probe.c
> +++ b/net/sctp/probe.c
> @@ -27,6 +27,7 @@
>  #include <linux/socket.h>
>  #include <linux/sctp.h>
>  #include <linux/proc_fs.h>
> +#include <linux/vmalloc.h>
>  #include <linux/module.h>
>  #include <linux/kfifo.h>
>  #include <linux/time.h>