[NET]: cleanup extra semicolons

Spring cleaning time...

There seems to be a lot of places in the network code that have
extra bogus semicolons after conditionals.  Most commonly is a
bogus semicolon after: switch() { }

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

8 files changed, 20 insertions, 16 deletions

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 9ba9e92d1934..33ccc95c349b 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2288,7 +2288,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
                 default:
                         addrconf_dev_config(dev);
                         break;
-                };
+                }
                 if (idev) {
                         if (run_pending)
                                 addrconf_dad_run(idev);
@@ -2341,7 +2341,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
                 }
 #endif
                 break;
-        };
+        }
 
         return NOTIFY_OK;
 }
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 4a355fea4098..403eee66b9c5 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -723,7 +723,7 @@ int datagram_send_ctl(struct msghdr *msg, struct flowi *fl,
                                        cmsg->cmsg_type);
                         err = -EINVAL;
                         break;
-                };
+                }
         }
 
 exit_f:
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index 275d2e812a44..4aa7fb024b3a 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -130,7 +130,7 @@ static int ip6_tlvopt_unknown(struct sk_buff **skbp, int optoff)
         case 2: /* send ICMP PARM PROB regardless and drop packet */
                 icmpv6_param_prob(skb, ICMPV6_UNK_OPTION, optoff);
                 return 0;
-        };
+        }
 
         kfree_skb(skb);
         return 0;
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index e94992ab92e6..e9bcce9e7bdf 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -732,7 +732,8 @@ static int icmpv6_rcv(struct sk_buff **pskb)
                  */
 
                 icmpv6_notify(skb, type, hdr->icmp6_code, hdr->icmp6_mtu);
-        };
+        }
+
         kfree_skb(skb);
         return 0;
 
@@ -865,7 +866,7 @@ int icmpv6_err_convert(int type, int code, int *err)
         case ICMPV6_TIME_EXCEED:
                 *err = EHOSTUNREACH;
                 break;
-        };
+        }
 
         return fatal;
 }
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index b1cf70816477..4ee1216f8018 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1630,7 +1630,7 @@ int ndisc_rcv(struct sk_buff *skb)
         case NDISC_REDIRECT:
                 ndisc_redirect_rcv(skb);
                 break;
-        };
+        }
 
         return 0;
 }
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index f65fcd7704ca..009a1047fc3f 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -882,7 +882,7 @@ static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
                 return 0;
         default:
                 return -ENOPROTOOPT;
-        };
+        }
 
         return 0;
 }
@@ -907,7 +907,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
                 return 0;
         default:
                 return -ENOPROTOOPT;
-        };
+        }
 
         return 0;
 }
@@ -961,7 +961,8 @@ static int rawv6_setsockopt(struct sock *sk, int level, int optname,
                 default:
                         return ipv6_setsockopt(sk, level, optname, optval,
                                                optlen);
-        };
+        }
+
         return do_rawv6_setsockopt(sk, level, optname, optval, optlen);
 }
 
@@ -982,7 +983,7 @@ static int compat_rawv6_setsockopt(struct sock *sk, int level, int optname,
         default:
                 return compat_ipv6_setsockopt(sk, level, optname,
                                               optval, optlen);
-        };
+        }
         return do_rawv6_setsockopt(sk, level, optname, optval, optlen);
 }
 #endif
@@ -1035,7 +1036,8 @@ static int rawv6_getsockopt(struct sock *sk, int level, int optname,
                 default:
                         return ipv6_getsockopt(sk, level, optname, optval,
                                                optlen);
-        };
+        }
+
         return do_rawv6_getsockopt(sk, level, optname, optval, optlen);
 }
 
@@ -1056,7 +1058,7 @@ static int compat_rawv6_getsockopt(struct sock *sk, int level, int optname,
         default:
                 return compat_ipv6_getsockopt(sk, level, optname,
                                               optval, optlen);
-        };
+        }
         return do_rawv6_getsockopt(sk, level, optname, optval, optlen);
 }
 #endif
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 70f760f069b1..6264ec3bb154 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1760,7 +1760,7 @@ int ipv6_route_ioctl(unsigned int cmd, void __user *arg)
                 rtnl_unlock();
 
                 return err;
-        };
+        }
 
         return -EINVAL;
 }
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index ef746d4f3131..1faa2ea80afc 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -240,7 +240,8 @@ __xfrm6_bundle_create(struct xfrm_policy *policy, struct xfrm_state **xfrm, int
                 if (!afinfo) {
                         dst = *dst_p;
                         goto error;
-                };
+                }
+
                 dst_prev->output = afinfo->output;
                 xfrm_state_put_afinfo(afinfo);
                 /* Sheit... I remember I did this right. Apparently,
@@ -337,7 +338,7 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl)
                         fl->fl_ipsec_spi = 0;
                         fl->proto = nexthdr;
                         return;
-                };
+                }
         }
 }