Merge commit 'v3.17' into next

1 files changed, 0 insertions, 4 deletions

diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index 5170a1ff95a1..d3f1ea460c50 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -4182,7 +4182,6 @@ sctp_disposition_t sctp_sf_unk_chunk(struct net *net,
         case SCTP_CID_ACTION_DISCARD:
                 /* Discard the packet.  */
                 return sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
-                break;
         case SCTP_CID_ACTION_DISCARD_ERR:
                 /* Generate an ERROR chunk as response. */
                 hdr = unk_chunk->chunk_hdr;
@@ -4198,11 +4197,9 @@ sctp_disposition_t sctp_sf_unk_chunk(struct net *net,
                 /* Discard the packet.  */
                 sctp_sf_pdiscard(net, ep, asoc, type, arg, commands);
                 return SCTP_DISPOSITION_CONSUME;
-                break;
         case SCTP_CID_ACTION_SKIP:
                 /* Skip the chunk.  */
                 return SCTP_DISPOSITION_DISCARD;
-                break;
         case SCTP_CID_ACTION_SKIP_ERR:
                 /* Generate an ERROR chunk as response. */
                 hdr = unk_chunk->chunk_hdr;
@@ -4216,7 +4213,6 @@ sctp_disposition_t sctp_sf_unk_chunk(struct net *net,
                 }
                 /* Skip the chunk.  */
                 return SCTP_DISPOSITION_CONSUME;
-                break;
         default:
                 break;
         }