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

This reverts commit cda5f98e36576596b9230483ec52bff3cc97eb21.

As per Vlad's request.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 1b27b0b8687f988180b7c17dcffbddfc11a34807..36be26b2ef7af81407771420e3e146099bf6b468 100644 (file)
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -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.

diff --git a/include/net/netns/sctp.h b/include/net/netns/sctp.h
index ebfdf1e7d4023d7ac81f7b3ec6ca3246510b60ee..3573a81815ad9e0efb6ceb721eb066d3726419f0 100644 (file)
--- a/include/net/netns/sctp.h
+++ b/include/net/netns/sctp.h
@@ -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__ */

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 78eedf0cd4b32d921316803ccba14ab08fb995ce..422db6cc3214b77264eccec4288ece4315f045e7 100644 (file)
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -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 {

diff --git a/net/sctp/input.c b/net/sctp/input.c
index 2873e221e187800a025e8c15573a45276a278a8c..5f2068679f8339b8a85b85cf2dc7b185a663dd9c 100644 (file)
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -134,8 +134,8 @@ 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) &&
-           sctp_rcv_checksum(net, skb) < 0)
+       if (!sctp_checksum_disable && !skb_csum_unnecessary(skb) &&
+                 sctp_rcv_checksum(net, skb) < 0)
                goto discard_it;
 
        skb_pull(skb, sizeof(struct sctphdr));

diff --git a/net/sctp/output.c b/net/sctp/output.c
index e35b84cc1d9f517c9a01b9d0732a4ef817327b41..0ac3a65daccb71cd78ae5e2c52696c33df7e16e4 100644 (file)
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -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);
 

diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 54482977a48f33359561d7a52fc850bc5573e8ae..5e17092f4adacbf0335dc33bcbde5a1f830b43df 100644 (file)
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -1187,9 +1187,6 @@ static int __net_init sctp_net_init(struct net *net)
        /* Whether Cookie Preservative is enabled(1) or not(0) */
        net->sctp.cookie_preserve_enable        = 1;
 
-       /* Whether SCTP checksumming is disabled(1) or not(0) */
-       net->sctp.checksum_disable              = 0;
-
        /* Default sctp sockets to use md5 as their hmac alg */
 #if defined (CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5)
        net->sctp.sctp_hmac_alg                 = "md5";
@@ -1546,4 +1543,6 @@ MODULE_ALIAS("net-pf-" __stringify(PF_INET) "-proto-132");
 MODULE_ALIAS("net-pf-" __stringify(PF_INET6) "-proto-132");
 MODULE_AUTHOR("Linux Kernel SCTP developers <linux-sctp@vger.kernel.org>");
 MODULE_DESCRIPTION("Support for the SCTP protocol (RFC2960)");
+module_param_named(no_checksums, sctp_checksum_disable, bool, 0644);
+MODULE_PARM_DESC(no_checksums, "Disable checksums computing and verification");
 MODULE_LICENSE("GPL");

diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
index 1b1ee769b5bf12bc29cc097236b30243cc6177bf..6b36561a1b3b7cceab5f5a4a9dce7aa2bc362266 100644 (file)
--- a/net/sctp/sysctl.c
+++ b/net/sctp/sysctl.c
@@ -290,15 +290,7 @@ static struct ctl_table sctp_net_table[] = {
                .extra1         = &max_autoclose_min,
                .extra2         = &max_autoclose_max,
        },
-       {
-               .procname       = "checksum_disable",
-               .data           = &init_net.sctp.checksum_disable,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec_minmax,
-               .extra1         = &zero,
-               .extra2         = &one,
-       },
+
        { /* sentinel */ }
 };