Merge commit 'v3.17' into next

1 files changed, 0 insertions, 2 deletions

diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index e70301eb7a4a..50f9a9db5792 100644
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -289,10 +289,8 @@ static int net_dm_cmd_trace(struct sk_buff *skb,
         switch (info->genlhdr->cmd) {
         case NET_DM_CMD_START:
                 return set_all_monitor_traces(TRACE_ON);
-                break;
         case NET_DM_CMD_STOP:
                 return set_all_monitor_traces(TRACE_OFF);
-                break;
         }
 
         return -ENOTSUPP;