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

Commit 71acc0dd authored by David S. Miller's avatar David S. Miller
Browse files

Revert "net: sctp: convert sctp_checksum_disable module param into sctp sysctl" 



This reverts commit cda5f98e.

As per Vlad's request.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 477143e3

Documentation/networking/ip-sysctl.txt

+0 −8
Original line number Diff line number Diff line
@@ -1507,14 +1507,6 @@ sack_timeout - INTEGER 


	Default: 200



checksum_disable - BOOLEAN

	Disable SCTP checksum computing and verification for debugging purpose.



	1: Disable checksumming

	0: Enable checksumming



	Default: 0



valid_cookie_life - INTEGER

	The default lifetime of the SCTP cookie (in milliseconds).  The cookie

	is used during association establishment.

include/net/netns/sctp.h

+0 −3
Original line number Diff line number Diff line
@@ -129,9 +129,6 @@ struct netns_sctp { 


	/* Threshold for autoclose timeout, in seconds. */

	unsigned long max_autoclose;



	/* Flag to disable SCTP checksumming. */

	int checksum_disable;

};



#endif /* __NETNS_SCTP_H__ */

include/net/sctp/structs.h

+5 −0
Original line number Diff line number Diff line
@@ -135,6 +135,10 @@ extern struct sctp_globals { 
	/* This is the sctp port control hash.	*/

	int port_hashsize;

	struct sctp_bind_hashbucket *port_hashtable;



	/* Flag to indicate whether computing and verifying checksum

	 * is disabled. */

        bool checksum_disable;

} sctp_globals;



#define sctp_max_instreams		(sctp_globals.max_instreams)
@@ -146,6 +150,7 @@ extern struct sctp_globals { 
#define sctp_assoc_hashtable		(sctp_globals.assoc_hashtable)

#define sctp_port_hashsize		(sctp_globals.port_hashsize)

#define sctp_port_hashtable		(sctp_globals.port_hashtable)

#define sctp_checksum_disable		(sctp_globals.checksum_disable)



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

typedef enum {

net/sctp/input.c

+2 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ int sctp_rcv(struct sk_buff *skb) 
	__skb_pull(skb, skb_transport_offset(skb));

	if (skb->len < sizeof(struct sctphdr))

		goto discard_it;

	if (!net->sctp.checksum_disable && !skb_csum_unnecessary(skb) &&

	if (!sctp_checksum_disable && !skb_csum_unnecessary(skb) &&

		  sctp_rcv_checksum(net, skb) < 0)

		goto discard_it;

net/sctp/output.c

+1 −4
Original line number Diff line number Diff line
@@ -389,7 +389,6 @@ int sctp_packet_transmit(struct sctp_packet *packet) 
	int padding;		/* How much padding do we need?  */

	__u8 has_data = 0;

	struct dst_entry *dst = tp->dst;

	struct net *net;

	unsigned char *auth = NULL;	/* pointer to auth in skb data */

	__u32 cksum_buf_len = sizeof(struct sctphdr);
@@ -536,9 +535,7 @@ int sctp_packet_transmit(struct sctp_packet *packet) 
	 * Note: Adler-32 is no longer applicable, as has been replaced

	 * by CRC32-C as described in <draft-ietf-tsvwg-sctpcsum-02.txt>.

	 */

	net = dev_net(dst->dev);



	if (!net->sctp.checksum_disable) {

	if (!sctp_checksum_disable) {

		if (!(dst->dev->features & NETIF_F_SCTP_CSUM)) {

			__u32 crc32 = sctp_start_cksum((__u8 *)sh, cksum_buf_len);