]> git.karo-electronics.de Git - linux-beck.git/commitdiff
sctp: fix checkpatch errors with indent
authorwangweidong <wangweidong1@huawei.com>
Mon, 23 Dec 2013 04:16:52 +0000 (12:16 +0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Dec 2013 18:47:48 +0000 (13:47 -0500)
fix checkpatch errors below:
ERROR: switch and case should be at the same inden
ERROR: code indent should use tabs where possible

Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Wang Weidong <wangweidong1@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sctp/auth.c
net/sctp/input.c
net/sctp/output.c
net/sctp/sm_make_chunk.c
net/sctp/sm_statefuns.c
net/sctp/sm_statetable.c

index 889400bbf411bbb448aa3376064a0cc8303899c2..a594b3ca583473ba727b532db29cd5c451385268 100644 (file)
@@ -647,15 +647,15 @@ static int __sctp_auth_cid(sctp_cid_t chunk, struct sctp_chunks_param *param)
         */
        for (i = 0; !found && i < len; i++) {
                switch (param->chunks[i]) {
-                   case SCTP_CID_INIT:
-                   case SCTP_CID_INIT_ACK:
-                   case SCTP_CID_SHUTDOWN_COMPLETE:
-                   case SCTP_CID_AUTH:
+               case SCTP_CID_INIT:
+               case SCTP_CID_INIT_ACK:
+               case SCTP_CID_SHUTDOWN_COMPLETE:
+               case SCTP_CID_AUTH:
                        break;
 
-                   default:
+               default:
                        if (param->chunks[i] == chunk)
-                           found = 1;
+                               found = 1;
                        break;
                }
        }
index 44f8793d91dff693f1db2ea345066b51fa6ca37f..b67e3d83b48afb2926bd2233232e9ec3c4d0241c 100644 (file)
@@ -1056,30 +1056,30 @@ static struct sctp_association *__sctp_rcv_walk_lookup(struct net *net,
                        break;
 
                switch (ch->type) {
-                   case SCTP_CID_AUTH:
-                           have_auth = chunk_num;
-                           break;
-
-                   case SCTP_CID_COOKIE_ECHO:
-                           /* If a packet arrives containing an AUTH chunk as
-                            * a first chunk, a COOKIE-ECHO chunk as the second
-                            * chunk, and possibly more chunks after them, and
-                            * the receiver does not have an STCB for that
-                            * packet, then authentication is based on
-                            * the contents of the COOKIE- ECHO chunk.
-                            */
-                           if (have_auth == 1 && chunk_num == 2)
-                                   return NULL;
-                           break;
-
-                   case SCTP_CID_ASCONF:
-                           if (have_auth || net->sctp.addip_noauth)
-                                   asoc = __sctp_rcv_asconf_lookup(
-                                                       net, ch, laddr,
-                                                       sctp_hdr(skb)->source,
-                                                       transportp);
-                   default:
-                           break;
+               case SCTP_CID_AUTH:
+                       have_auth = chunk_num;
+                       break;
+
+               case SCTP_CID_COOKIE_ECHO:
+                       /* If a packet arrives containing an AUTH chunk as
+                        * a first chunk, a COOKIE-ECHO chunk as the second
+                        * chunk, and possibly more chunks after them, and
+                        * the receiver does not have an STCB for that
+                        * packet, then authentication is based on
+                        * the contents of the COOKIE- ECHO chunk.
+                        */
+                       if (have_auth == 1 && chunk_num == 2)
+                               return NULL;
+                       break;
+
+               case SCTP_CID_ASCONF:
+                       if (have_auth || net->sctp.addip_noauth)
+                               asoc = __sctp_rcv_asconf_lookup(
+                                               net, ch, laddr,
+                                               sctp_hdr(skb)->source,
+                                               transportp);
+               default:
+                       break;
                }
 
                if (asoc)
index 3be70a41a5debdca8cfaecc57dbcdc1cc82979d5..b971cd226cf5518619e55bf8e8ccc1b933dcc1bc 100644 (file)
@@ -280,7 +280,7 @@ static sctp_xmit_t __sctp_packet_append_chunk(struct sctp_packet *packet,
 
        /* We believe that this chunk is OK to add to the packet */
        switch (chunk->chunk_hdr->type) {
-           case SCTP_CID_DATA:
+       case SCTP_CID_DATA:
                /* Account for the data being in the packet */
                sctp_packet_append_data(packet, chunk);
                /* Disallow SACK bundling after DATA. */
@@ -292,17 +292,17 @@ static sctp_xmit_t __sctp_packet_append_chunk(struct sctp_packet *packet,
                /* timestamp the chunk for rtx purposes */
                chunk->sent_at = jiffies;
                break;
-           case SCTP_CID_COOKIE_ECHO:
+       case SCTP_CID_COOKIE_ECHO:
                packet->has_cookie_echo = 1;
                break;
 
-           case SCTP_CID_SACK:
+       case SCTP_CID_SACK:
                packet->has_sack = 1;
                if (chunk->asoc)
                        chunk->asoc->stats.osacks++;
                break;
 
-           case SCTP_CID_AUTH:
+       case SCTP_CID_AUTH:
                packet->has_auth = 1;
                packet->auth = chunk;
                break;
@@ -540,8 +540,7 @@ int sctp_packet_transmit(struct sctp_packet *packet)
                } else {
                        /* no need to seed pseudo checksum for SCTP */
                        nskb->ip_summed = CHECKSUM_PARTIAL;
-                       nskb->csum_start = (skb_transport_header(nskb) -
-                                           nskb->head);
+                       nskb->csum_start = skb_transport_header(nskb) - nskb->head;
                        nskb->csum_offset = offsetof(struct sctphdr, checksum);
                }
        }
index d53af47efa7dfc5c192d2f453fb7f75312814d83..e5f7cdb42a850c66c758c81b7f0ce999724158a9 100644 (file)
@@ -1967,13 +1967,13 @@ static int sctp_verify_ext_param(struct net *net, union sctp_params param)
 
        for (i = 0; i < num_ext; i++) {
                switch (param.ext->chunks[i]) {
-                   case SCTP_CID_AUTH:
-                           have_auth = 1;
-                           break;
-                   case SCTP_CID_ASCONF:
-                   case SCTP_CID_ASCONF_ACK:
-                           have_asconf = 1;
-                           break;
+               case SCTP_CID_AUTH:
+                       have_auth = 1;
+                       break;
+               case SCTP_CID_ASCONF:
+               case SCTP_CID_ASCONF_ACK:
+                       have_asconf = 1;
+                       break;
                }
        }
 
@@ -2000,25 +2000,24 @@ static void sctp_process_ext_param(struct sctp_association *asoc,
 
        for (i = 0; i < num_ext; i++) {
                switch (param.ext->chunks[i]) {
-                   case SCTP_CID_FWD_TSN:
-                           if (net->sctp.prsctp_enable &&
-                               !asoc->peer.prsctp_capable)
+               case SCTP_CID_FWD_TSN:
+                       if (net->sctp.prsctp_enable && !asoc->peer.prsctp_capable)
                                    asoc->peer.prsctp_capable = 1;
-                           break;
-                   case SCTP_CID_AUTH:
-                           /* if the peer reports AUTH, assume that he
-                            * supports AUTH.
-                            */
-                           if (net->sctp.auth_enable)
-                                   asoc->peer.auth_capable = 1;
-                           break;
-                   case SCTP_CID_ASCONF:
-                   case SCTP_CID_ASCONF_ACK:
-                           if (net->sctp.addip_enable)
-                                   asoc->peer.asconf_capable = 1;
-                           break;
-                   default:
-                           break;
+                       break;
+               case SCTP_CID_AUTH:
+                       /* if the peer reports AUTH, assume that he
+                        * supports AUTH.
+                        */
+                       if (net->sctp.auth_enable)
+                               asoc->peer.auth_capable = 1;
+                       break;
+               case SCTP_CID_ASCONF:
+               case SCTP_CID_ASCONF_ACK:
+                       if (net->sctp.addip_enable)
+                               asoc->peer.asconf_capable = 1;
+                       break;
+               default:
+                       break;
                }
        }
 }
@@ -2266,14 +2265,14 @@ int sctp_verify_init(struct net *net, const struct sctp_association *asoc,
 
                result = sctp_verify_param(net, asoc, param, cid, chunk, errp);
                switch (result) {
-                   case SCTP_IERROR_ABORT:
-                   case SCTP_IERROR_NOMEM:
-                               return 0;
-                   case SCTP_IERROR_ERROR:
-                               return 1;
-                   case SCTP_IERROR_NO_ERROR:
-                   default:
-                               break;
+               case SCTP_IERROR_ABORT:
+               case SCTP_IERROR_NOMEM:
+                       return 0;
+               case SCTP_IERROR_ERROR:
+                       return 1;
+               case SCTP_IERROR_NO_ERROR:
+               default:
+                       break;
                }
 
        } /* for (loop through all parameters) */
index 624e4ef9f0730ed6d4ed2ea247ec102847875b61..483dcd71b3c5f76a17dc66aee156c0b6caf60bac 100644 (file)
@@ -3681,8 +3681,7 @@ sctp_disposition_t sctp_sf_do_asconf(struct net *net,
        asconf_ack->dest = chunk->source;
        sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(asconf_ack));
        if (asoc->new_transport) {
-               sctp_sf_heartbeat(ep, asoc, type, asoc->new_transport,
-                    commands);
+               sctp_sf_heartbeat(ep, asoc, type, asoc->new_transport, commands);
                ((struct sctp_association *)asoc)->new_transport = NULL;
        }
 
@@ -6207,7 +6206,7 @@ static int sctp_eat_data(const struct sctp_association *asoc,
         */
        if (*sk->sk_prot_creator->memory_pressure) {
                if (sctp_tsnmap_has_gap(map) &&
-                  (sctp_tsnmap_get_ctsn(map) + 1) == tsn) {
+                   (sctp_tsnmap_get_ctsn(map) + 1) == tsn) {
                        pr_debug("%s: under pressure, reneging for tsn:%u\n",
                                 __func__, tsn);
                        deliver = SCTP_CMD_RENEGE;
index a4f17437fb220ca9c1ac50fd89dffd25a644c091..a987d54b379c5c57513ef2f0fac046c8cae2bf75 100644 (file)
@@ -69,7 +69,7 @@ static const sctp_sm_table_entry_t bug = {
        if ((event_subtype._type > (_max))) {                           \
                pr_warn("table %p possible attack: event %d exceeds max %d\n", \
                        _table, event_subtype._type, _max);             \
-               rtn = &bug;                                             \
+               rtn = &bug;                                             \
        } else                                                          \
                rtn = &_table[event_subtype._type][(int)state];         \
                                                                        \