sctp: remove net sctp.x_enable working as a global switch

The netns sctp feature flags shouldn't work as a global switch,
which is mostly like a firewall/netfilter's job. Also, it will
break asoc as it discard or accept chunks incorrectly when net
sctp.x_enable is changed after the asoc is created.

Since each type of chunk's processing function will check the
corresp asoc's feature flag, this 'global switch' should be
removed, and net sctp.x_enable will only work as the default
feature flags for the future sctp sockets/endpoints.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sctp/sm_statetable.c b/net/sctp/sm_statetable.c
index 61ed9c6..88ea87f 100644 (file)
--- a/net/sctp/sm_statetable.c
+++ b/net/sctp/sm_statetable.c
@@ -976,26 +976,22 @@ static const struct sctp_sm_table_entry *sctp_chunk_event_lookup(
        if (cid <= SCTP_CID_BASE_MAX)
                return &chunk_event_table[cid][state];
 
-       if (net->sctp.prsctp_enable) {
-               if (cid == SCTP_CID_FWD_TSN || cid == SCTP_CID_I_FWD_TSN)
-                       return &prsctp_chunk_event_table[0][state];
-       }
+       switch ((u16)cid) {
+       case SCTP_CID_FWD_TSN:
+       case SCTP_CID_I_FWD_TSN:
+               return &prsctp_chunk_event_table[0][state];
 
-       if (net->sctp.addip_enable) {
-               if (cid == SCTP_CID_ASCONF)
-                       return &addip_chunk_event_table[0][state];
+       case SCTP_CID_ASCONF:
+               return &addip_chunk_event_table[0][state];
 
-               if (cid == SCTP_CID_ASCONF_ACK)
-                       return &addip_chunk_event_table[1][state];
-       }
+       case SCTP_CID_ASCONF_ACK:
+               return &addip_chunk_event_table[1][state];
 
-       if (net->sctp.reconf_enable)
-               if (cid == SCTP_CID_RECONF)
-                       return &reconf_chunk_event_table[0][state];
+       case SCTP_CID_RECONF:
+               return &reconf_chunk_event_table[0][state];
 
-       if (net->sctp.auth_enable) {
-               if (cid == SCTP_CID_AUTH)
-                       return &auth_chunk_event_table[0][state];
+       case SCTP_CID_AUTH:
+               return &auth_chunk_event_table[0][state];
        }
 
        return &chunk_event_table_unknown[state];