net: Remove unnecessary semicolons after switch statements

Also added an explicit break; to avoid
a fallthrough in net/ipv4/tcp_input.c

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index c584a0af77d3efaf436a1cc07413fcfa31f442e1..bd537fc10254c9fbb6cf3872e8488bba1809781b 100644 (file)
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -61,7 +61,7 @@ int vlan_hwaccel_do_receive(struct sk_buff *skb)
                                        dev->dev_addr))
                        skb->pkt_type = PACKET_HOST;
                break;
-       };
+       }
        return 0;
 }
 

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 1a7db92037faef12e2671ad8eeecca241cd4c1eb..a0f4964033d289b8d1b4959d4d1196ccc094bdff 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -522,7 +522,7 @@ static int ethtool_get_rx_ntuple(struct net_device *dev, void __user *useraddr)
                        p += ETH_GSTRING_LEN;
                        num_strings++;
                        goto unknown_filter;
-               };
+               }
 
                /* now the rest of the filters */
                switch (fsc->fs.flow_type) {
@@ -646,7 +646,7 @@ static int ethtool_get_rx_ntuple(struct net_device *dev, void __user *useraddr)
                        p += ETH_GSTRING_LEN;
                        num_strings++;
                        break;
-               };
+               }
                sprintf(p, "\tVLAN: %d, mask: 0x%x\n",
                        fsc->fs.vlan_tag, fsc->fs.vlan_tag_mask);
                p += ETH_GSTRING_LEN;

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 3284393d09b4f06bbaba0d840abb299fb28c161e..6596b4feeddc7879fc020606f53dabdc8608f3e8 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2215,7 +2215,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
        default:
                /* fallthru */
                break;
-       };
+       }
 
        if (optlen < sizeof(int))
                return -EINVAL;

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index e82162c211bf8ba2c26841da4a505fe54b42a7d5..3e6dafcb1071663c2e0590da7c379b6b324bbe0f 100644 (file)
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3845,12 +3845,13 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
                                        /* 16-bit multiple */
                                        opt_rx->cookie_plus = opsize;
                                        *hvpp = ptr;
+                                       break;
                                default:
                                        /* ignore option */
                                        break;
-                               };
+                               }
                                break;
-                       };
+                       }
 
                        ptr += opsize-2;
                        length -= opsize;

diff --git a/net/rds/tcp_connect.c b/net/rds/tcp_connect.c
index 056256285987dea30ffcb2a93b71bf5af8b904c1..c397524c039cdb28140ff5f6c0fe2359cebfa3b5 100644 (file)
--- a/net/rds/tcp_connect.c
+++ b/net/rds/tcp_connect.c
@@ -141,7 +141,7 @@ void rds_tcp_conn_shutdown(struct rds_connection *conn)
 
                release_sock(sock->sk);
                sock_release(sock);
-       };
+       }
 
        if (tc->t_tinc) {
                rds_inc_put(&tc->t_tinc->ti_inc);

diff --git a/net/socket.c b/net/socket.c
index dae8c6b84a096c7b8066e719d22c6bcc9a7e8269..f9f7d0872cacf96cb7e5d4716b5b4c2358b13dae 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -2615,7 +2615,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
                return dev_ioctl(net, cmd, uifr);
        default:
                return -EINVAL;
-       };
+       }
 }
 
 static int siocdevprivate_ioctl(struct net *net, unsigned int cmd,

diff --git a/net/xfrm/xfrm_hash.h b/net/xfrm/xfrm_hash.h
index 1396572d2ade279b58c7c0197393df1f232f02d9..8e69533d2313a63a7a4718898ce12277ca92a432 100644 (file)
--- a/net/xfrm/xfrm_hash.h
+++ b/net/xfrm/xfrm_hash.h
@@ -55,7 +55,7 @@ static inline unsigned __xfrm_src_hash(xfrm_address_t *daddr,
        case AF_INET6:
                h ^= __xfrm6_daddr_saddr_hash(daddr, saddr);
                break;
-       };
+       }
        return (h ^ (h >> 16)) & hmask;
 }
 
@@ -102,7 +102,7 @@ static inline unsigned int __sel_hash(struct xfrm_selector *sel, unsigned short
 
                h = __xfrm6_daddr_saddr_hash(daddr, saddr);
                break;
-       };
+       }
        h ^= (h >> 16);
        return h & hmask;
 }
@@ -119,7 +119,7 @@ static inline unsigned int __addr_hash(xfrm_address_t *daddr, xfrm_address_t *sa
        case AF_INET6:
                h = __xfrm6_daddr_saddr_hash(daddr, saddr);
                break;
-       };
+       }
        h ^= (h >> 16);
        return h & hmask;
 }