Commit f7010e61 authored by wangweidong's avatar wangweidong Committed by David S. Miller

sctp: fix checkpatch errors with indent

fix checkpatch errors below:
ERROR: switch and case should be at the same inden
ERROR: code indent should use tabs where possible
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarWang Weidong <wangweidong1@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 26ac8e5f
...@@ -647,15 +647,15 @@ static int __sctp_auth_cid(sctp_cid_t chunk, struct sctp_chunks_param *param) ...@@ -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++) { for (i = 0; !found && i < len; i++) {
switch (param->chunks[i]) { switch (param->chunks[i]) {
case SCTP_CID_INIT: case SCTP_CID_INIT:
case SCTP_CID_INIT_ACK: case SCTP_CID_INIT_ACK:
case SCTP_CID_SHUTDOWN_COMPLETE: case SCTP_CID_SHUTDOWN_COMPLETE:
case SCTP_CID_AUTH: case SCTP_CID_AUTH:
break; break;
default: default:
if (param->chunks[i] == chunk) if (param->chunks[i] == chunk)
found = 1; found = 1;
break; break;
} }
} }
......
...@@ -1056,30 +1056,30 @@ static struct sctp_association *__sctp_rcv_walk_lookup(struct net *net, ...@@ -1056,30 +1056,30 @@ static struct sctp_association *__sctp_rcv_walk_lookup(struct net *net,
break; break;
switch (ch->type) { switch (ch->type) {
case SCTP_CID_AUTH: case SCTP_CID_AUTH:
have_auth = chunk_num; have_auth = chunk_num;
break; break;
case SCTP_CID_COOKIE_ECHO: case SCTP_CID_COOKIE_ECHO:
/* If a packet arrives containing an AUTH chunk as /* If a packet arrives containing an AUTH chunk as
* a first chunk, a COOKIE-ECHO chunk as the second * a first chunk, a COOKIE-ECHO chunk as the second
* chunk, and possibly more chunks after them, and * chunk, and possibly more chunks after them, and
* the receiver does not have an STCB for that * the receiver does not have an STCB for that
* packet, then authentication is based on * packet, then authentication is based on
* the contents of the COOKIE- ECHO chunk. * the contents of the COOKIE- ECHO chunk.
*/ */
if (have_auth == 1 && chunk_num == 2) if (have_auth == 1 && chunk_num == 2)
return NULL; return NULL;
break; break;
case SCTP_CID_ASCONF: case SCTP_CID_ASCONF:
if (have_auth || net->sctp.addip_noauth) if (have_auth || net->sctp.addip_noauth)
asoc = __sctp_rcv_asconf_lookup( asoc = __sctp_rcv_asconf_lookup(
net, ch, laddr, net, ch, laddr,
sctp_hdr(skb)->source, sctp_hdr(skb)->source,
transportp); transportp);
default: default:
break; break;
} }
if (asoc) if (asoc)
......
...@@ -280,7 +280,7 @@ static sctp_xmit_t __sctp_packet_append_chunk(struct sctp_packet *packet, ...@@ -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 */ /* We believe that this chunk is OK to add to the packet */
switch (chunk->chunk_hdr->type) { switch (chunk->chunk_hdr->type) {
case SCTP_CID_DATA: case SCTP_CID_DATA:
/* Account for the data being in the packet */ /* Account for the data being in the packet */
sctp_packet_append_data(packet, chunk); sctp_packet_append_data(packet, chunk);
/* Disallow SACK bundling after DATA. */ /* Disallow SACK bundling after DATA. */
...@@ -292,17 +292,17 @@ static sctp_xmit_t __sctp_packet_append_chunk(struct sctp_packet *packet, ...@@ -292,17 +292,17 @@ static sctp_xmit_t __sctp_packet_append_chunk(struct sctp_packet *packet,
/* timestamp the chunk for rtx purposes */ /* timestamp the chunk for rtx purposes */
chunk->sent_at = jiffies; chunk->sent_at = jiffies;
break; break;
case SCTP_CID_COOKIE_ECHO: case SCTP_CID_COOKIE_ECHO:
packet->has_cookie_echo = 1; packet->has_cookie_echo = 1;
break; break;
case SCTP_CID_SACK: case SCTP_CID_SACK:
packet->has_sack = 1; packet->has_sack = 1;
if (chunk->asoc) if (chunk->asoc)
chunk->asoc->stats.osacks++; chunk->asoc->stats.osacks++;
break; break;
case SCTP_CID_AUTH: case SCTP_CID_AUTH:
packet->has_auth = 1; packet->has_auth = 1;
packet->auth = chunk; packet->auth = chunk;
break; break;
...@@ -540,8 +540,7 @@ int sctp_packet_transmit(struct sctp_packet *packet) ...@@ -540,8 +540,7 @@ int sctp_packet_transmit(struct sctp_packet *packet)
} else { } else {
/* no need to seed pseudo checksum for SCTP */ /* no need to seed pseudo checksum for SCTP */
nskb->ip_summed = CHECKSUM_PARTIAL; nskb->ip_summed = CHECKSUM_PARTIAL;
nskb->csum_start = (skb_transport_header(nskb) - nskb->csum_start = skb_transport_header(nskb) - nskb->head;
nskb->head);
nskb->csum_offset = offsetof(struct sctphdr, checksum); nskb->csum_offset = offsetof(struct sctphdr, checksum);
} }
} }
......
...@@ -1967,13 +1967,13 @@ static int sctp_verify_ext_param(struct net *net, union sctp_params param) ...@@ -1967,13 +1967,13 @@ static int sctp_verify_ext_param(struct net *net, union sctp_params param)
for (i = 0; i < num_ext; i++) { for (i = 0; i < num_ext; i++) {
switch (param.ext->chunks[i]) { switch (param.ext->chunks[i]) {
case SCTP_CID_AUTH: case SCTP_CID_AUTH:
have_auth = 1; have_auth = 1;
break; break;
case SCTP_CID_ASCONF: case SCTP_CID_ASCONF:
case SCTP_CID_ASCONF_ACK: case SCTP_CID_ASCONF_ACK:
have_asconf = 1; have_asconf = 1;
break; break;
} }
} }
...@@ -2000,25 +2000,24 @@ static void sctp_process_ext_param(struct sctp_association *asoc, ...@@ -2000,25 +2000,24 @@ static void sctp_process_ext_param(struct sctp_association *asoc,
for (i = 0; i < num_ext; i++) { for (i = 0; i < num_ext; i++) {
switch (param.ext->chunks[i]) { switch (param.ext->chunks[i]) {
case SCTP_CID_FWD_TSN: case SCTP_CID_FWD_TSN:
if (net->sctp.prsctp_enable && if (net->sctp.prsctp_enable && !asoc->peer.prsctp_capable)
!asoc->peer.prsctp_capable)
asoc->peer.prsctp_capable = 1; asoc->peer.prsctp_capable = 1;
break; break;
case SCTP_CID_AUTH: case SCTP_CID_AUTH:
/* if the peer reports AUTH, assume that he /* if the peer reports AUTH, assume that he
* supports AUTH. * supports AUTH.
*/ */
if (net->sctp.auth_enable) if (net->sctp.auth_enable)
asoc->peer.auth_capable = 1; asoc->peer.auth_capable = 1;
break; break;
case SCTP_CID_ASCONF: case SCTP_CID_ASCONF:
case SCTP_CID_ASCONF_ACK: case SCTP_CID_ASCONF_ACK:
if (net->sctp.addip_enable) if (net->sctp.addip_enable)
asoc->peer.asconf_capable = 1; asoc->peer.asconf_capable = 1;
break; break;
default: default:
break; break;
} }
} }
} }
...@@ -2266,14 +2265,14 @@ int sctp_verify_init(struct net *net, const struct sctp_association *asoc, ...@@ -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); result = sctp_verify_param(net, asoc, param, cid, chunk, errp);
switch (result) { switch (result) {
case SCTP_IERROR_ABORT: case SCTP_IERROR_ABORT:
case SCTP_IERROR_NOMEM: case SCTP_IERROR_NOMEM:
return 0; return 0;
case SCTP_IERROR_ERROR: case SCTP_IERROR_ERROR:
return 1; return 1;
case SCTP_IERROR_NO_ERROR: case SCTP_IERROR_NO_ERROR:
default: default:
break; break;
} }
} /* for (loop through all parameters) */ } /* for (loop through all parameters) */
......
...@@ -3681,8 +3681,7 @@ sctp_disposition_t sctp_sf_do_asconf(struct net *net, ...@@ -3681,8 +3681,7 @@ sctp_disposition_t sctp_sf_do_asconf(struct net *net,
asconf_ack->dest = chunk->source; asconf_ack->dest = chunk->source;
sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(asconf_ack)); sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(asconf_ack));
if (asoc->new_transport) { if (asoc->new_transport) {
sctp_sf_heartbeat(ep, asoc, type, asoc->new_transport, sctp_sf_heartbeat(ep, asoc, type, asoc->new_transport, commands);
commands);
((struct sctp_association *)asoc)->new_transport = NULL; ((struct sctp_association *)asoc)->new_transport = NULL;
} }
...@@ -6207,7 +6206,7 @@ static int sctp_eat_data(const struct sctp_association *asoc, ...@@ -6207,7 +6206,7 @@ static int sctp_eat_data(const struct sctp_association *asoc,
*/ */
if (*sk->sk_prot_creator->memory_pressure) { if (*sk->sk_prot_creator->memory_pressure) {
if (sctp_tsnmap_has_gap(map) && 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", pr_debug("%s: under pressure, reneging for tsn:%u\n",
__func__, tsn); __func__, tsn);
deliver = SCTP_CMD_RENEGE; deliver = SCTP_CMD_RENEGE;
......
...@@ -69,7 +69,7 @@ static const sctp_sm_table_entry_t bug = { ...@@ -69,7 +69,7 @@ static const sctp_sm_table_entry_t bug = {
if ((event_subtype._type > (_max))) { \ if ((event_subtype._type > (_max))) { \
pr_warn("table %p possible attack: event %d exceeds max %d\n", \ pr_warn("table %p possible attack: event %d exceeds max %d\n", \
_table, event_subtype._type, _max); \ _table, event_subtype._type, _max); \
rtn = &bug; \ rtn = &bug; \
} else \ } else \
rtn = &_table[event_subtype._type][(int)state]; \ rtn = &_table[event_subtype._type][(int)state]; \
\ \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment