Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5656b6ca authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev

parents c1ac403b 4814326b

Documentation/feature-removal-schedule.txt

+0 −12
Original line number Diff line number Diff line
@@ -302,18 +302,6 @@ Who: ocfs2-devel@oss.oracle.com 


---------------------------



What:	SCTP_GET_PEER_ADDRS_NUM_OLD, SCTP_GET_PEER_ADDRS_OLD,

	SCTP_GET_LOCAL_ADDRS_NUM_OLD, SCTP_GET_LOCAL_ADDRS_OLD

When: 	June 2009

Why:    A newer version of the options have been introduced in 2005 that

	removes the limitions of the old API.  The sctp library has been

        converted to use these new options at the same time.  Any user

	space app that directly uses the old options should convert to using

	the new options.

Who:	Vlad Yasevich <vladislav.yasevich@hp.com>



---------------------------



What:	Ability for non root users to shm_get hugetlb pages based on mlock

	resource limits

When:	2.6.31

include/linux/sctp.h

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ enum { 
	SCTP_DATA_FIRST_FRAG	= 0x02,

	SCTP_DATA_NOT_FRAG	= 0x03,

	SCTP_DATA_UNORDERED	= 0x04,

	SCTP_DATA_SACK_IMM	= 0x08,

};

enum { SCTP_DATA_FRAG_MASK = 0x03, };

include/net/sctp/constants.h

+4 −0
Original line number Diff line number Diff line
@@ -308,6 +308,10 @@ enum { SCTP_MAX_GABS = 16 }; 


#define SCTP_DEFAULT_MINWINDOW	1500	/* default minimum rwnd size */

#define SCTP_DEFAULT_MAXWINDOW	65535	/* default rwnd size */

#define SCTP_DEFAULT_RWND_SHIFT  4	/* by default, update on 1/16 of

					 * rcvbuf, which is 1/8 of initial

					 * window

					 */

#define SCTP_DEFAULT_MAXSEGMENT 1500	/* MTU size, this is the limit

                                         * to which we will raise the P-MTU.

					 */

include/net/sctp/sm.h

+2 −1
Original line number Diff line number Diff line
@@ -243,7 +243,8 @@ struct sctp_chunk *sctp_make_op_error(const struct sctp_association *, 
				 const struct sctp_chunk *chunk,

				 __be16 cause_code,

				 const void *payload,

				 size_t paylen);

				 size_t paylen,

				 size_t reserve_tail);



struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *,

					      union sctp_addr *,

include/net/sctp/structs.h

+10 −6
Original line number Diff line number Diff line
@@ -231,6 +231,11 @@ extern struct sctp_globals { 
	/* Flag to indicate whether computing and verifying checksum

	 * is disabled. */

        int checksum_disable;



	/* Threshold for rwnd update SACKS.  Receive buffer shifted this many

	 * bits is an indicator of when to send and window update SACK.

	 */

	int rwnd_update_shift;

} sctp_globals;



#define sctp_rto_initial		(sctp_globals.rto_initial)
@@ -267,6 +272,7 @@ extern struct sctp_globals { 
#define sctp_prsctp_enable		(sctp_globals.prsctp_enable)

#define sctp_auth_enable		(sctp_globals.auth_enable)

#define sctp_checksum_disable		(sctp_globals.checksum_disable)

#define sctp_rwnd_upd_shift		(sctp_globals.rwnd_update_shift)



/* SCTP Socket type: UDP or TCP style. */

typedef enum {
@@ -936,6 +942,8 @@ struct sctp_transport { 
	/* Data that has been sent, but not acknowledged. */

	__u32 flight_size;



	__u32 burst_limited;	/* Holds old cwnd when max.burst is applied */



	/* TSN marking the fast recovery exit point */

	__u32 fast_recovery_exit;
@@ -944,12 +952,6 @@ struct sctp_transport { 
	/* Source address. */

	union sctp_addr saddr;



	/* When was the last time(in jiffies) that a data packet was sent on

	 * this transport?  This is used to adjust the cwnd when the transport

	 * becomes inactive.

	 */

	unsigned long last_time_used;



	/* Heartbeat interval: The endpoint sends out a Heartbeat chunk to

	 * the destination address every heartbeat interval.

	 */
@@ -1070,6 +1072,8 @@ void sctp_transport_put(struct sctp_transport *); 
void sctp_transport_update_rto(struct sctp_transport *, __u32);

void sctp_transport_raise_cwnd(struct sctp_transport *, __u32, __u32);

void sctp_transport_lower_cwnd(struct sctp_transport *, sctp_lower_cwnd_t);

void sctp_transport_burst_limited(struct sctp_transport *);

void sctp_transport_burst_reset(struct sctp_transport *);

unsigned long sctp_transport_timeout(struct sctp_transport *);

void sctp_transport_reset(struct sctp_transport *);

void sctp_transport_update_pmtu(struct sctp_transport *, u32);