Dave, Please pull the following SCTP updates from master.kernel.org:/pub/scm/linux/kernel/git/sridhar/lksctp-2.6.git
Thanks Sridhar include/linux/sysctl.h | 1 + include/net/sctp/command.h | 7 ++++--- include/net/sctp/structs.h | 19 ++++++++++++++++--- net/sctp/associola.c | 33 +++++++++++++++++++++++++++++---- net/sctp/endpointola.c | 26 +++----------------------- net/sctp/input.c | 20 -------------------- net/sctp/protocol.c | 6 ++++++ net/sctp/sm_sideeffect.c | 6 +++--- net/sctp/sm_statefuns.c | 22 ++++++++++++++++++++++ net/sctp/socket.c | 5 ++++- net/sctp/sysctl.c | 8 ++++++++ net/sctp/ulpevent.c | 24 +++++++----------------- 12 files changed, 103 insertions(+), 74 deletions(-) commit d1de8a6feef58d4ebc46b638918aa00aab1cd516 Author: Neil Horman <[EMAIL PROTECTED]> Date: Fri Nov 11 12:05:16 2005 -0800 [SCTP] Include ulpevents in socket receive buffer accounting. Also introduces a sysctl option to configure the receive buffer accounting policy to be either at socket or association level. Default is all the associations on the same socket share the receive buffer. Signed-off-by: Neil Horman <[EMAIL PROTECTED]> Signed-off-by: Sridhar Samudrala <[EMAIL PROTECTED]> commit 3e7ed6e581623e3c18b3b6b689635c614141bd94 Author: Vladislav Yasevich <[EMAIL PROTECTED]> Date: Fri Nov 11 12:03:56 2005 -0800 [SCTP] Fix ia64 NaT consumption fault with sctp_sideffect commands. On ia64, it is possible to get NaT Consumption Fault and a kernel panic when initializing sctp sideeffect commands arguments. The union sctp_arg_t contains different sized elements and when loading a smaller sized element (32 or 16 bits), it is possible for a speculative load to fail and result in a NaT bit set which causes a kernel crash. The easy way to get around it is to load the largerst member of the union. Signed-off-by: Vladislav Yasevich <[EMAIL PROTECTED]> Signed-off-by: Sridhar Samudrala <[EMAIL PROTECTED]> commit 4765e01cb611e2e06c9795753bac5dcb785de35a Author: Vladislav Yasevich <[EMAIL PROTECTED]> Date: Fri Nov 11 12:02:41 2005 -0800 [SCTP] Remove timeouts[] array from sctp_endpoint. The socket level timeout values are maintained in sctp_sock and association level timeouts are in sctp_association. So there is no need for ep->timeouts. Signed-off-by: Vladislav Yasevich <[EMAIL PROTECTED]> Signed-off-by: Sridhar Samudrala <[EMAIL PROTECTED]> commit ccf983e53967356ac977a0ebce1921730cc51e62 Author: Vladislav Yasevich <[EMAIL PROTECTED]> Date: Fri Nov 11 12:00:57 2005 -0800 [SCTP] Fix potential NULL pointer dereference in sctp_v4_get_saddr It is possible to get to sctp_v4_get_saddr() without a valid association. This happens when processing OOTB packets and the cached route entry is no longer valid. However, when responding to OOTB packets, we already properly set the source address based on the information in the OOTB packet. So, if we we get to sctp_v4_get_saddr() without an association we can simply return. Signed-off-by: Vladislav Yasevich <[EMAIL PROTECTED]> Signed-off-by: Sridhar Samudrala <[EMAIL PROTECTED]> - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html