12 files changed, 34 insertions, 31 deletions

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 37a343e1ebb7..db73ef97485a 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -733,7 +733,7 @@ void sctp_assoc_control_transport(struct sctp_association *asoc,
 
         default:
                 return;
-        };
+        }
 
         /* Generate and send a SCTP_PEER_ADDR_CHANGE notification to the
          * user.
diff --git a/net/sctp/debug.c b/net/sctp/debug.c
index 5f5ab28977c9..e8c0f7435d7f 100644
--- a/net/sctp/debug.c
+++ b/net/sctp/debug.c
@@ -93,8 +93,9 @@ const char *sctp_cname(const sctp_subtype_t cid)
                 return "FWD_TSN";
 
         default:
-                return "unknown chunk";
-        };
+                break;
+        }
+
         return "unknown chunk";
 }
 
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 5b0cdda4b449..ca527a27dd05 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -604,7 +604,7 @@ static sctp_scope_t sctp_v6_scope(union sctp_addr *addr)
         default:
                 retval = SCTP_SCOPE_GLOBAL;
                 break;
-        };
+        }
 
         return retval;
 }
diff --git a/net/sctp/output.c b/net/sctp/output.c
index f875fc3ced54..d85543def754 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -176,7 +176,7 @@ sctp_xmit_t sctp_packet_transmit_chunk(struct sctp_packet *packet,
         case SCTP_XMIT_OK:
         case SCTP_XMIT_NAGLE_DELAY:
                 break;
-        };
+        }
 
         return retval;
 }
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index 41abfd17627e..992f361084b7 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -338,7 +338,7 @@ int sctp_outq_tail(struct sctp_outq *q, struct sctp_chunk *chunk)
                                 SCTP_INC_STATS(SCTP_MIB_OUTORDERCHUNKS);
                         q->empty = 0;
                         break;
-                };
+                }
         } else {
                 list_add_tail(&chunk->list, &q->control_chunk_list);
                 SCTP_INC_STATS(SCTP_MIB_OUTCTRLCHUNKS);
@@ -630,7 +630,7 @@ static int sctp_outq_flush_rtx(struct sctp_outq *q, struct sctp_packet *pkt,
                         /* Retrieve a new chunk to bundle. */
                         lchunk = sctp_list_dequeue(lqueue);
                         break;
-                };
+                }
 
                 /* If we are here due to a retransmit timeout or a fast
                  * retransmit and if there are any chunks left in the retransmit
@@ -779,7 +779,7 @@ int sctp_outq_flush(struct sctp_outq *q, int rtx_timeout)
                 default:
                         /* We built a chunk with an illegal type! */
                         BUG();
-                };
+                }
         }
 
         /* Is it OK to send data chunks?  */
@@ -1397,7 +1397,7 @@ static void sctp_check_transmitted(struct sctp_outq *q,
                                 SCTP_DEBUG_PRINTK("ACKed: %08x", tsn);
                                 dbg_prt_state = 0;
                                 dbg_ack_tsn = tsn;
-                        };
+                        }
 
                         dbg_last_ack_tsn = tsn;
 #endif /* SCTP_DEBUG */
@@ -1452,7 +1452,7 @@ static void sctp_check_transmitted(struct sctp_outq *q,
                                 SCTP_DEBUG_PRINTK("KEPT: %08x",tsn);
                                 dbg_prt_state = 1;
                                 dbg_kept_tsn = tsn;
-                        };
+                        }
 
                         dbg_last_kept_tsn = tsn;
 #endif /* SCTP_DEBUG */
@@ -1476,7 +1476,7 @@ static void sctp_check_transmitted(struct sctp_outq *q,
                 } else {
                         SCTP_DEBUG_PRINTK("\n");
                 }
-        };
+        }
 #endif /* SCTP_DEBUG */
         if (transport) {
                 if (bytes_acked) {
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 759ea3d19976..be783a3761c4 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -2077,7 +2077,7 @@ static int sctp_process_param(struct sctp_association *asoc,
 
                         default: /* Just ignore anything else.  */
                                 break;
-                        };
+                        }
                 }
                 break;
 
@@ -2118,7 +2118,7 @@ static int sctp_process_param(struct sctp_association *asoc,
                 SCTP_DEBUG_PRINTK("Ignoring param: %d for association %p.\n",
                                   ntohs(param.p->type), asoc);
                 break;
-        };
+        }
 
         return retval;
 }
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index 0a1a197193a2..b37a7adeb150 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -1009,7 +1009,7 @@ static int sctp_side_effects(sctp_event_t event_type, sctp_subtype_t subtype,
                        status, state, event_type, subtype.chunk);
                 BUG();
                 break;
-        };
+        }
 
 bail:
         return error;
@@ -1489,7 +1489,8 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
                         printk(KERN_WARNING "Impossible command: %u, %p\n",
                                cmd->verb, cmd->obj.ptr);
                         break;
-                };
+                }
+
                 if (error)
                         break;
         }
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index e0ec16dd678a..9e28a5d51200 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -629,7 +629,7 @@ sctp_disposition_t sctp_sf_do_5_1D_ce(const struct sctp_endpoint *ep,
                 case -SCTP_IERROR_BAD_SIG:
                 default:
                         return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
-                };
+                }
         }
 
 
@@ -1195,7 +1195,7 @@ static void sctp_tietags_populate(struct sctp_association *new_asoc,
                 new_asoc->c.my_ttag   = asoc->c.my_vtag;
                 new_asoc->c.peer_ttag = asoc->c.peer_vtag;
                 break;
-        };
+        }
 
         /* Other parameters for the endpoint SHOULD be copied from the
          * existing parameters of the association (e.g. number of
@@ -1904,7 +1904,7 @@ sctp_disposition_t sctp_sf_do_5_2_4_dupcook(const struct sctp_endpoint *ep,
                 case -SCTP_IERROR_BAD_SIG:
                 default:
                         return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
-                };
+                }
         }
 
         /* Compare the tie_tag in cookie with the verification tag of
@@ -1936,7 +1936,7 @@ sctp_disposition_t sctp_sf_do_5_2_4_dupcook(const struct sctp_endpoint *ep,
         default: /* Discard packet for all others. */
                 retval = sctp_sf_pdiscard(ep, asoc, type, arg, commands);
                 break;
-        };
+        }
 
         /* Delete the tempory new association. */
         sctp_add_cmd_sf(commands, SCTP_CMD_NEW_ASOC, SCTP_ASOC(new_asoc));
@@ -4816,7 +4816,7 @@ sctp_disposition_t sctp_sf_t2_timer_expire(const struct sctp_endpoint *ep,
         default:
                 BUG();
                 break;
-        };
+        }
 
         if (!reply)
                 goto nomem;
diff --git a/net/sctp/sm_statetable.c b/net/sctp/sm_statetable.c
index 5e54b17377f4..523071c7902f 100644
--- a/net/sctp/sm_statetable.c
+++ b/net/sctp/sm_statetable.c
@@ -101,7 +101,7 @@ const sctp_sm_table_entry_t *sctp_sm_lookup_event(sctp_event_t event_type,
         default:
                 /* Yikes!  We got an illegal event type.  */
                 return &bug;
-        };
+        }
 }
 
 #define TYPE_SCTP_FUNC(func) {.fn = func, .name = #func}
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index f904f2bc0f2c..11938fb20395 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -941,7 +941,7 @@ SCTP_STATIC int sctp_setsockopt_bindx(struct sock* sk,
         default:
                 err = -EINVAL;
                 break;
-        };
+        }
 
 out:
         kfree(kaddrs);
@@ -3048,7 +3048,7 @@ SCTP_STATIC int sctp_setsockopt(struct sock *sk, int level, int optname,
         default:
                 retval = -ENOPROTOOPT;
                 break;
-        };
+        }
 
         sctp_release_sock(sk);
 
@@ -4873,7 +4873,7 @@ SCTP_STATIC int sctp_getsockopt(struct sock *sk, int level, int optname,
         default:
                 retval = -ENOPROTOOPT;
                 break;
-        };
+        }
 
         sctp_release_sock(sk);
         return retval;
@@ -5198,7 +5198,8 @@ int sctp_inet_listen(struct socket *sock, int backlog)
                 break;
         default:
                 break;
-        };
+        }
+
         if (err)
                 goto cleanup;
 
@@ -5461,7 +5462,7 @@ SCTP_STATIC int sctp_msghdr_parse(const struct msghdr *msg,
 
                 default:
                         return -EINVAL;
-                };
+                }
         }
         return 0;
 }
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index 4d8c2ab864fc..961df275d5b9 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -507,7 +507,7 @@ void sctp_transport_lower_cwnd(struct sctp_transport *transport,
                         transport->cwnd = max(transport->cwnd/2,
                                                  4*transport->asoc->pathmtu);
                 break;
-        };
+        }
 
         transport->partial_bytes_acked = 0;
         SCTP_DEBUG_PRINTK("%s: transport: %p reason: %d cwnd: "
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c
index 0fa4d4d4df17..34eb977a204d 100644
--- a/net/sctp/ulpqueue.c
+++ b/net/sctp/ulpqueue.c
@@ -391,7 +391,7 @@ static struct sctp_ulpevent *sctp_make_reassembled_event(struct sk_buff_head *qu
                         break;
                 pos->next = pnext;
                 pos = pnext;
-        };
+        }
 
         event = sctp_skb2event(f_frag);
         SCTP_INC_STATS(SCTP_MIB_REASMUSRMSGS);
@@ -476,7 +476,7 @@ static inline struct sctp_ulpevent *sctp_ulpq_retrieve_reassembled(struct sctp_u
                         else
                                 first_frag = NULL;
                         break;
-                };
+                }
         }
 
         asoc = ulpq->asoc;
@@ -556,7 +556,7 @@ static inline struct sctp_ulpevent *sctp_ulpq_retrieve_partial(struct sctp_ulpq
                         goto done;
                 default:
                         return NULL;
-                };
+                }
         }
 
         /* We have the reassembled event. There is no need to look
@@ -648,7 +648,7 @@ static inline struct sctp_ulpevent *sctp_ulpq_retrieve_first(struct sctp_ulpq *u
                         break;
                 default:
                         return NULL;
-                };
+                }
         }
 
         /* We have the reassembled event. There is no need to look