aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@linux-foundation.org>2007-04-20 20:09:22 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:29:24 -0400
commit3ff50b7997fe06cd5d276b229967bb52d6b3b6c1 (patch)
tree4f0f57123a945c3e6c39759456b6187bb78c4b1f /net
parentc462238d6a6d8ee855bda10f9fff442971540ed2 (diff)
[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>
Diffstat (limited to 'net')
-rw-r--r--net/802/tr.c3
-rw-r--r--net/8021q/vlan.c6
-rw-r--r--net/8021q/vlan_dev.c4
-rw-r--r--net/ax25/ax25_ip.c2
-rw-r--r--net/bluetooth/hci_core.c4
-rw-r--r--net/bluetooth/sco.c2
-rw-r--r--net/core/link_watch.c2
-rw-r--r--net/core/pktgen.c6
-rw-r--r--net/core/rtnetlink.c2
-rw-r--r--net/core/skbuff.c2
-rw-r--r--net/ipv4/fib_semantics.c2
-rw-r--r--net/ipv4/ipconfig.c4
-rw-r--r--net/ipv4/multipath_drr.c2
-rw-r--r--net/ipv4/tcp.c7
-rw-r--r--net/ipv4/tcp_input.c9
-rw-r--r--net/ipv4/xfrm4_policy.c2
-rw-r--r--net/ipv6/addrconf.c4
-rw-r--r--net/ipv6/datagram.c2
-rw-r--r--net/ipv6/exthdrs.c2
-rw-r--r--net/ipv6/icmp.c5
-rw-r--r--net/ipv6/ndisc.c2
-rw-r--r--net/ipv6/raw.c14
-rw-r--r--net/ipv6/route.c2
-rw-r--r--net/ipv6/xfrm6_policy.c5
-rw-r--r--net/irda/af_irda.c4
-rw-r--r--net/iucv/af_iucv.c2
-rw-r--r--net/key/af_key.c2
-rw-r--r--net/sched/cls_u32.c2
-rw-r--r--net/sched/sch_dsmark.c6
-rw-r--r--net/sched/sch_ingress.c4
-rw-r--r--net/sched/sch_prio.c2
-rw-r--r--net/sctp/associola.c2
-rw-r--r--net/sctp/debug.c5
-rw-r--r--net/sctp/ipv6.c2
-rw-r--r--net/sctp/output.c2
-rw-r--r--net/sctp/outqueue.c12
-rw-r--r--net/sctp/sm_make_chunk.c4
-rw-r--r--net/sctp/sm_sideeffect.c5
-rw-r--r--net/sctp/sm_statefuns.c10
-rw-r--r--net/sctp/sm_statetable.c2
-rw-r--r--net/sctp/socket.c11
-rw-r--r--net/sctp/transport.c2
-rw-r--r--net/sctp/ulpqueue.c8
-rw-r--r--net/tipc/link.c2
-rw-r--r--net/xfrm/xfrm_policy.c2
-rw-r--r--net/xfrm/xfrm_state.c8
-rw-r--r--net/xfrm/xfrm_user.c22
47 files changed, 113 insertions, 103 deletions
diff --git a/net/802/tr.c b/net/802/tr.c
index eb2de0d16208..0ba1946211c9 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -554,7 +554,8 @@ static int rif_seq_show(struct seq_file *seq, void *v)
554 if(j==1) { 554 if(j==1) {
555 segment=ntohs(entry->rseg[j-1])>>4; 555 segment=ntohs(entry->rseg[j-1])>>4;
556 seq_printf(seq," %03X",segment); 556 seq_printf(seq," %03X",segment);
557 }; 557 }
558
558 segment=ntohs(entry->rseg[j])>>4; 559 segment=ntohs(entry->rseg[j])>>4;
559 brdgnmb=ntohs(entry->rseg[j-1])&0x00f; 560 brdgnmb=ntohs(entry->rseg[j-1])&0x00f;
560 seq_printf(seq,"-%01X-%03X",brdgnmb,segment); 561 seq_printf(seq,"-%01X-%03X",brdgnmb,segment);
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index eb1c71ed7dfe..c0c7bb8e9f07 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -470,7 +470,7 @@ static struct net_device *register_vlan_device(const char *eth_IF_name,
470 */ 470 */
471 default: 471 default:
472 snprintf(name, IFNAMSIZ, "vlan%.4i", VLAN_ID); 472 snprintf(name, IFNAMSIZ, "vlan%.4i", VLAN_ID);
473 }; 473 }
474 474
475 new_dev = alloc_netdev(sizeof(struct vlan_dev_info), name, 475 new_dev = alloc_netdev(sizeof(struct vlan_dev_info), name,
476 vlan_setup); 476 vlan_setup);
@@ -685,7 +685,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
685 break; 685 break;
686 } 686 }
687 break; 687 break;
688 }; 688 }
689 689
690out: 690out:
691 return NOTIFY_DONE; 691 return NOTIFY_DONE;
@@ -819,7 +819,7 @@ static int vlan_ioctl_handler(void __user *arg)
819 printk(VLAN_DBG "%s: Unknown VLAN CMD: %x \n", 819 printk(VLAN_DBG "%s: Unknown VLAN CMD: %x \n",
820 __FUNCTION__, args.cmd); 820 __FUNCTION__, args.cmd);
821 return -EINVAL; 821 return -EINVAL;
822 }; 822 }
823out: 823out:
824 return err; 824 return err;
825} 825}
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 7ff6b7948485..ec46084f44b4 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -66,7 +66,7 @@ int vlan_dev_rebuild_header(struct sk_buff *skb)
66 66
67 memcpy(veth->h_source, dev->dev_addr, ETH_ALEN); 67 memcpy(veth->h_source, dev->dev_addr, ETH_ALEN);
68 break; 68 break;
69 }; 69 }
70 70
71 return 0; 71 return 0;
72} 72}
@@ -219,7 +219,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
219 break; 219 break;
220 default: 220 default:
221 break; 221 break;
222 }; 222 }
223 223
224 /* Was a VLAN packet, grab the encapsulated protocol, which the layer 224 /* Was a VLAN packet, grab the encapsulated protocol, which the layer
225 * three protocols care about. 225 * three protocols care about.
diff --git a/net/ax25/ax25_ip.c b/net/ax25/ax25_ip.c
index 4d4ef35e1782..930e4918037f 100644
--- a/net/ax25/ax25_ip.c
+++ b/net/ax25/ax25_ip.c
@@ -121,7 +121,7 @@ int ax25_rebuild_header(struct sk_buff *skb)
121 digipeat = route->digipeat; 121 digipeat = route->digipeat;
122 dev = route->dev; 122 dev = route->dev;
123 ip_mode = route->ip_mode; 123 ip_mode = route->ip_mode;
124 }; 124 }
125 125
126 if (dev == NULL) 126 if (dev == NULL)
127 dev = skb->dev; 127 dev = skb->dev;
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index c177e75d64a6..aa4b56a8c3ea 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -149,7 +149,7 @@ static int __hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev,
149 default: 149 default:
150 err = -ETIMEDOUT; 150 err = -ETIMEDOUT;
151 break; 151 break;
152 }; 152 }
153 153
154 hdev->req_status = hdev->req_result = 0; 154 hdev->req_status = hdev->req_result = 0;
155 155
@@ -1388,7 +1388,7 @@ static void hci_rx_task(unsigned long arg)
1388 case HCI_SCODATA_PKT: 1388 case HCI_SCODATA_PKT:
1389 kfree_skb(skb); 1389 kfree_skb(skb);
1390 continue; 1390 continue;
1391 }; 1391 }
1392 } 1392 }
1393 1393
1394 /* Process frame */ 1394 /* Process frame */
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index ae4391440950..3f5163e725ed 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -393,7 +393,7 @@ static void sco_sock_close(struct sock *sk)
393 default: 393 default:
394 sock_set_flag(sk, SOCK_ZAPPED); 394 sock_set_flag(sk, SOCK_ZAPPED);
395 break; 395 break;
396 }; 396 }
397 397
398 release_sock(sk); 398 release_sock(sk);
399 399
diff --git a/net/core/link_watch.c b/net/core/link_watch.c
index 8b45c9d3b249..e3c26a9ccad6 100644
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
@@ -79,7 +79,7 @@ static void rfc2863_policy(struct net_device *dev)
79 case IF_LINK_MODE_DEFAULT: 79 case IF_LINK_MODE_DEFAULT:
80 default: 80 default:
81 break; 81 break;
82 }; 82 }
83 83
84 dev->operstate = operstate; 84 dev->operstate = operstate;
85 85
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index f9469ea530cc..b92a322872a8 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -786,7 +786,7 @@ static int count_trail_chars(const char __user * user_buffer,
786 break; 786 break;
787 default: 787 default:
788 goto done; 788 goto done;
789 }; 789 }
790 } 790 }
791done: 791done:
792 return i; 792 return i;
@@ -829,7 +829,7 @@ static int strn_len(const char __user * user_buffer, unsigned int maxlen)
829 break; 829 break;
830 default: 830 default:
831 break; 831 break;
832 }; 832 }
833 } 833 }
834done_str: 834done_str:
835 return i; 835 return i;
@@ -1906,7 +1906,7 @@ static int pktgen_device_event(struct notifier_block *unused,
1906 case NETDEV_UNREGISTER: 1906 case NETDEV_UNREGISTER:
1907 pktgen_mark_device(dev->name); 1907 pktgen_mark_device(dev->name);
1908 break; 1908 break;
1909 }; 1909 }
1910 1910
1911 return NOTIFY_DONE; 1911 return NOTIFY_DONE;
1912} 1912}
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index bc95fab0b0ce..75cea8ea4cf3 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -399,7 +399,7 @@ static void set_operstate(struct net_device *dev, unsigned char transition)
399 operstate == IF_OPER_UNKNOWN) 399 operstate == IF_OPER_UNKNOWN)
400 operstate = IF_OPER_DORMANT; 400 operstate = IF_OPER_DORMANT;
401 break; 401 break;
402 }; 402 }
403 403
404 if (dev->operstate != operstate) { 404 if (dev->operstate != operstate) {
405 write_lock_bh(&dev_base_lock); 405 write_lock_bh(&dev_base_lock);
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 6b50d58cce1e..142257307fa2 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -304,7 +304,7 @@ void kfree_skbmem(struct sk_buff *skb)
304 if (atomic_dec_and_test(fclone_ref)) 304 if (atomic_dec_and_test(fclone_ref))
305 kmem_cache_free(skbuff_fclone_cache, other); 305 kmem_cache_free(skbuff_fclone_cache, other);
306 break; 306 break;
307 }; 307 }
308} 308}
309 309
310/** 310/**
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index 3dad12ee76c3..406ea7050aed 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -927,7 +927,7 @@ int fib_semantic_match(struct list_head *head, const struct flowi *flp,
927 default: 927 default:
928 printk(KERN_DEBUG "impossible 102\n"); 928 printk(KERN_DEBUG "impossible 102\n");
929 return -EINVAL; 929 return -EINVAL;
930 }; 930 }
931 } 931 }
932 return err; 932 return err;
933 } 933 }
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 4e19ee0e0102..597c800b2fdc 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -939,7 +939,7 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str
939 if (opt[1] >= 4) 939 if (opt[1] >= 4)
940 memcpy(&server_id, opt + 2, 4); 940 memcpy(&server_id, opt + 2, 4);
941 break; 941 break;
942 }; 942 }
943 } 943 }
944 944
945#ifdef IPCONFIG_DEBUG 945#ifdef IPCONFIG_DEBUG
@@ -984,7 +984,7 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str
984 ic_myaddr = NONE; 984 ic_myaddr = NONE;
985 ic_servaddr = NONE; 985 ic_servaddr = NONE;
986 goto drop_unlock; 986 goto drop_unlock;
987 }; 987 }
988 988
989 ic_dhcp_msgtype = mt; 989 ic_dhcp_msgtype = mt;
990 990
diff --git a/net/ipv4/multipath_drr.c b/net/ipv4/multipath_drr.c
index 574c735836fc..b03c5ca2c823 100644
--- a/net/ipv4/multipath_drr.c
+++ b/net/ipv4/multipath_drr.c
@@ -100,7 +100,7 @@ static int drr_dev_event(struct notifier_block *this,
100 100
101 spin_unlock_bh(&state_lock); 101 spin_unlock_bh(&state_lock);
102 break; 102 break;
103 }; 103 }
104 104
105 return NOTIFY_DONE; 105 return NOTIFY_DONE;
106} 106}
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index bb9d91a7662f..4664733f139c 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -444,7 +444,7 @@ int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg)
444 break; 444 break;
445 default: 445 default:
446 return -ENOIOCTLCMD; 446 return -ENOIOCTLCMD;
447 }; 447 }
448 448
449 return put_user(answ, (int __user *)arg); 449 return put_user(answ, (int __user *)arg);
450} 450}
@@ -1954,7 +1954,8 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
1954 default: 1954 default:
1955 err = -ENOPROTOOPT; 1955 err = -ENOPROTOOPT;
1956 break; 1956 break;
1957 }; 1957 }
1958
1958 release_sock(sk); 1959 release_sock(sk);
1959 return err; 1960 return err;
1960} 1961}
@@ -2124,7 +2125,7 @@ static int do_tcp_getsockopt(struct sock *sk, int level,
2124 return 0; 2125 return 0;
2125 default: 2126 default:
2126 return -ENOPROTOOPT; 2127 return -ENOPROTOOPT;
2127 }; 2128 }
2128 2129
2129 if (put_user(len, optlen)) 2130 if (put_user(len, optlen))
2130 return -EFAULT; 2131 return -EFAULT;
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index d1604f59d77e..2fbfc2e4209c 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2708,7 +2708,7 @@ static int tcp_process_frto(struct sock *sk, u32 prior_snd_una, int flag)
2708 default: 2708 default:
2709 tcp_ratehalving_spur_to_response(sk); 2709 tcp_ratehalving_spur_to_response(sk);
2710 break; 2710 break;
2711 }; 2711 }
2712 tp->frto_counter = 0; 2712 tp->frto_counter = 0;
2713 } 2713 }
2714 return 0; 2714 return 0;
@@ -2915,10 +2915,11 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
2915 */ 2915 */
2916 break; 2916 break;
2917#endif 2917#endif
2918 }; 2918 }
2919
2919 ptr+=opsize-2; 2920 ptr+=opsize-2;
2920 length-=opsize; 2921 length-=opsize;
2921 }; 2922 }
2922 } 2923 }
2923} 2924}
2924 2925
@@ -3124,7 +3125,7 @@ static void tcp_fin(struct sk_buff *skb, struct sock *sk, struct tcphdr *th)
3124 printk(KERN_ERR "%s: Impossible, sk->sk_state=%d\n", 3125 printk(KERN_ERR "%s: Impossible, sk->sk_state=%d\n",
3125 __FUNCTION__, sk->sk_state); 3126 __FUNCTION__, sk->sk_state);
3126 break; 3127 break;
3127 }; 3128 }
3128 3129
3129 /* It _is_ possible, that we have something out-of-order _after_ FIN. 3130 /* It _is_ possible, that we have something out-of-order _after_ FIN.
3130 * Probably, we should reset in this case. For now drop them. 3131 * Probably, we should reset in this case. For now drop them.
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index f1c32ff59d16..4ff8ed30024f 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -263,7 +263,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl)
263 default: 263 default:
264 fl->fl_ipsec_spi = 0; 264 fl->fl_ipsec_spi = 0;
265 break; 265 break;
266 }; 266 }
267 } 267 }
268 fl->proto = iph->protocol; 268 fl->proto = iph->protocol;
269 fl->fl4_dst = iph->daddr; 269 fl->fl4_dst = iph->daddr;
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,
2288 default: 2288 default:
2289 addrconf_dev_config(dev); 2289 addrconf_dev_config(dev);
2290 break; 2290 break;
2291 }; 2291 }
2292 if (idev) { 2292 if (idev) {
2293 if (run_pending) 2293 if (run_pending)
2294 addrconf_dad_run(idev); 2294 addrconf_dad_run(idev);
@@ -2341,7 +2341,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
2341 } 2341 }
2342#endif 2342#endif
2343 break; 2343 break;
2344 }; 2344 }
2345 2345
2346 return NOTIFY_OK; 2346 return NOTIFY_OK;
2347} 2347}
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,
723 cmsg->cmsg_type); 723 cmsg->cmsg_type);
724 err = -EINVAL; 724 err = -EINVAL;
725 break; 725 break;
726 }; 726 }
727 } 727 }
728 728
729exit_f: 729exit_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)
130 case 2: /* send ICMP PARM PROB regardless and drop packet */ 130 case 2: /* send ICMP PARM PROB regardless and drop packet */
131 icmpv6_param_prob(skb, ICMPV6_UNK_OPTION, optoff); 131 icmpv6_param_prob(skb, ICMPV6_UNK_OPTION, optoff);
132 return 0; 132 return 0;
133 }; 133 }
134 134
135 kfree_skb(skb); 135 kfree_skb(skb);
136 return 0; 136 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)
732 */ 732 */
733 733
734 icmpv6_notify(skb, type, hdr->icmp6_code, hdr->icmp6_mtu); 734 icmpv6_notify(skb, type, hdr->icmp6_code, hdr->icmp6_mtu);
735 }; 735 }
736
736 kfree_skb(skb); 737 kfree_skb(skb);
737 return 0; 738 return 0;
738 739
@@ -865,7 +866,7 @@ int icmpv6_err_convert(int type, int code, int *err)
865 case ICMPV6_TIME_EXCEED: 866 case ICMPV6_TIME_EXCEED:
866 *err = EHOSTUNREACH; 867 *err = EHOSTUNREACH;
867 break; 868 break;
868 }; 869 }
869 870
870 return fatal; 871 return fatal;
871} 872}
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)
1630 case NDISC_REDIRECT: 1630 case NDISC_REDIRECT:
1631 ndisc_redirect_rcv(skb); 1631 ndisc_redirect_rcv(skb);
1632 break; 1632 break;
1633 }; 1633 }
1634 1634
1635 return 0; 1635 return 0;
1636} 1636}
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,
882 return 0; 882 return 0;
883 default: 883 default:
884 return -ENOPROTOOPT; 884 return -ENOPROTOOPT;
885 }; 885 }
886 886
887 return 0; 887 return 0;
888} 888}
@@ -907,7 +907,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
907 return 0; 907 return 0;
908 default: 908 default:
909 return -ENOPROTOOPT; 909 return -ENOPROTOOPT;
910 }; 910 }
911 911
912 return 0; 912 return 0;
913} 913}
@@ -961,7 +961,8 @@ static int rawv6_setsockopt(struct sock *sk, int level, int optname,
961 default: 961 default:
962 return ipv6_setsockopt(sk, level, optname, optval, 962 return ipv6_setsockopt(sk, level, optname, optval,
963 optlen); 963 optlen);
964 }; 964 }
965
965 return do_rawv6_setsockopt(sk, level, optname, optval, optlen); 966 return do_rawv6_setsockopt(sk, level, optname, optval, optlen);
966} 967}
967 968
@@ -982,7 +983,7 @@ static int compat_rawv6_setsockopt(struct sock *sk, int level, int optname,
982 default: 983 default:
983 return compat_ipv6_setsockopt(sk, level, optname, 984 return compat_ipv6_setsockopt(sk, level, optname,
984 optval, optlen); 985 optval, optlen);
985 }; 986 }
986 return do_rawv6_setsockopt(sk, level, optname, optval, optlen); 987 return do_rawv6_setsockopt(sk, level, optname, optval, optlen);
987} 988}
988#endif 989#endif
@@ -1035,7 +1036,8 @@ static int rawv6_getsockopt(struct sock *sk, int level, int optname,
1035 default: 1036 default:
1036 return ipv6_getsockopt(sk, level, optname, optval, 1037 return ipv6_getsockopt(sk, level, optname, optval,
1037 optlen); 1038 optlen);
1038 }; 1039 }
1040
1039 return do_rawv6_getsockopt(sk, level, optname, optval, optlen); 1041 return do_rawv6_getsockopt(sk, level, optname, optval, optlen);
1040} 1042}
1041 1043
@@ -1056,7 +1058,7 @@ static int compat_rawv6_getsockopt(struct sock *sk, int level, int optname,
1056 default: 1058 default:
1057 return compat_ipv6_getsockopt(sk, level, optname, 1059 return compat_ipv6_getsockopt(sk, level, optname,
1058 optval, optlen); 1060 optval, optlen);
1059 }; 1061 }
1060 return do_rawv6_getsockopt(sk, level, optname, optval, optlen); 1062 return do_rawv6_getsockopt(sk, level, optname, optval, optlen);
1061} 1063}
1062#endif 1064#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)
1760 rtnl_unlock(); 1760 rtnl_unlock();
1761 1761
1762 return err; 1762 return err;
1763 }; 1763 }
1764 1764
1765 return -EINVAL; 1765 return -EINVAL;
1766} 1766}
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
240 if (!afinfo) { 240 if (!afinfo) {
241 dst = *dst_p; 241 dst = *dst_p;
242 goto error; 242 goto error;
243 }; 243 }
244
244 dst_prev->output = afinfo->output; 245 dst_prev->output = afinfo->output;
245 xfrm_state_put_afinfo(afinfo); 246 xfrm_state_put_afinfo(afinfo);
246 /* Sheit... I remember I did this right. Apparently, 247 /* Sheit... I remember I did this right. Apparently,
@@ -337,7 +338,7 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl)
337 fl->fl_ipsec_spi = 0; 338 fl->fl_ipsec_spi = 0;
338 fl->proto = nexthdr; 339 fl->proto = nexthdr;
339 return; 340 return;
340 }; 341 }
341 } 342 }
342} 343}
343 344
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index bf994c85e45a..baca1565aa11 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -220,7 +220,7 @@ static void irda_connect_confirm(void *instance, void *sap,
220 break; 220 break;
221 default: 221 default:
222 self->max_data_size = irttp_get_max_seg_size(self->tsap); 222 self->max_data_size = irttp_get_max_seg_size(self->tsap);
223 }; 223 }
224 224
225 IRDA_DEBUG(2, "%s(), max_data_size=%d\n", __FUNCTION__, 225 IRDA_DEBUG(2, "%s(), max_data_size=%d\n", __FUNCTION__,
226 self->max_data_size); 226 self->max_data_size);
@@ -283,7 +283,7 @@ static void irda_connect_indication(void *instance, void *sap,
283 break; 283 break;
284 default: 284 default:
285 self->max_data_size = irttp_get_max_seg_size(self->tsap); 285 self->max_data_size = irttp_get_max_seg_size(self->tsap);
286 }; 286 }
287 287
288 IRDA_DEBUG(2, "%s(), max_data_size=%d\n", __FUNCTION__, 288 IRDA_DEBUG(2, "%s(), max_data_size=%d\n", __FUNCTION__,
289 self->max_data_size); 289 self->max_data_size);
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 55632883d17b..e84c924a81ee 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -181,7 +181,7 @@ static void iucv_sock_close(struct sock *sk)
181 default: 181 default:
182 sock_set_flag(sk, SOCK_ZAPPED); 182 sock_set_flag(sk, SOCK_ZAPPED);
183 break; 183 break;
184 }; 184 }
185 185
186 release_sock(sk); 186 release_sock(sk);
187 iucv_sock_kill(sk); 187 iucv_sock_kill(sk);
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 3cd228aacfe8..a99444142dc7 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -379,7 +379,7 @@ static int verify_address_len(void *p)
379 */ 379 */
380 return -EINVAL; 380 return -EINVAL;
381 break; 381 break;
382 }; 382 }
383 383
384 return 0; 384 return 0;
385} 385}
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 62e1deb27a17..c7a347bd6d70 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -436,7 +436,7 @@ static void u32_destroy(struct tcf_proto *tp)
436 BUG_TRAP(ht->refcnt == 0); 436 BUG_TRAP(ht->refcnt == 0);
437 437
438 kfree(ht); 438 kfree(ht);
439 }; 439 }
440 440
441 kfree(tp_c); 441 kfree(tp_c);
442 } 442 }
diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index e38e0d00d1e6..3c6fd181263f 100644
--- a/net/sched/sch_dsmark.c
+++ b/net/sched/sch_dsmark.c
@@ -226,7 +226,7 @@ static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch)
226 default: 226 default:
227 skb->tc_index = 0; 227 skb->tc_index = 0;
228 break; 228 break;
229 }; 229 }
230 } 230 }
231 231
232 if (TC_H_MAJ(skb->priority) == sch->handle) 232 if (TC_H_MAJ(skb->priority) == sch->handle)
@@ -257,7 +257,7 @@ static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch)
257 if (p->default_index != NO_DEFAULT_INDEX) 257 if (p->default_index != NO_DEFAULT_INDEX)
258 skb->tc_index = p->default_index; 258 skb->tc_index = p->default_index;
259 break; 259 break;
260 }; 260 }
261 } 261 }
262 262
263 err = p->q->enqueue(skb,p->q); 263 err = p->q->enqueue(skb,p->q);
@@ -310,7 +310,7 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch)
310 "unsupported protocol %d\n", 310 "unsupported protocol %d\n",
311 ntohs(skb->protocol)); 311 ntohs(skb->protocol));
312 break; 312 break;
313 }; 313 }
314 314
315 return skb; 315 return skb;
316} 316}
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index ad22dc6af22a..f8b9f1cdf738 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -170,7 +170,7 @@ static int ingress_enqueue(struct sk_buff *skb,struct Qdisc *sch)
170 skb->tc_index = TC_H_MIN(res.classid); 170 skb->tc_index = TC_H_MIN(res.classid);
171 result = TC_ACT_OK; 171 result = TC_ACT_OK;
172 break; 172 break;
173 }; 173 }
174/* backward compat */ 174/* backward compat */
175#else 175#else
176#ifdef CONFIG_NET_CLS_POLICE 176#ifdef CONFIG_NET_CLS_POLICE
@@ -187,7 +187,7 @@ static int ingress_enqueue(struct sk_buff *skb,struct Qdisc *sch)
187 sch->bstats.bytes += skb->len; 187 sch->bstats.bytes += skb->len;
188 result = NF_ACCEPT; 188 result = NF_ACCEPT;
189 break; 189 break;
190 }; 190 }
191 191
192#else 192#else
193 D2PRINTK("Overriding result to ACCEPT\n"); 193 D2PRINTK("Overriding result to ACCEPT\n");
diff --git a/net/sched/sch_prio.c b/net/sched/sch_prio.c
index 5cfe60bf6e25..269a6e17c6c4 100644
--- a/net/sched/sch_prio.c
+++ b/net/sched/sch_prio.c
@@ -62,7 +62,7 @@ prio_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
62 *qerr = NET_XMIT_SUCCESS; 62 *qerr = NET_XMIT_SUCCESS;
63 case TC_ACT_SHOT: 63 case TC_ACT_SHOT:
64 return NULL; 64 return NULL;
65 }; 65 }
66 66
67 if (!q->filter_list ) { 67 if (!q->filter_list ) {
68#else 68#else
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,
733 733
734 default: 734 default:
735 return; 735 return;
736 }; 736 }
737 737
738 /* Generate and send a SCTP_PEER_ADDR_CHANGE notification to the 738 /* Generate and send a SCTP_PEER_ADDR_CHANGE notification to the
739 * user. 739 * 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)
93 return "FWD_TSN"; 93 return "FWD_TSN";
94 94
95 default: 95 default:
96 return "unknown chunk"; 96 break;
97 }; 97 }
98
98 return "unknown chunk"; 99 return "unknown chunk";
99} 100}
100 101
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)
604 default: 604 default:
605 retval = SCTP_SCOPE_GLOBAL; 605 retval = SCTP_SCOPE_GLOBAL;
606 break; 606 break;
607 }; 607 }
608 608
609 return retval; 609 return retval;
610} 610}
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,
176 case SCTP_XMIT_OK: 176 case SCTP_XMIT_OK:
177 case SCTP_XMIT_NAGLE_DELAY: 177 case SCTP_XMIT_NAGLE_DELAY:
178 break; 178 break;
179 }; 179 }
180 180
181 return retval; 181 return retval;
182} 182}
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)
338 SCTP_INC_STATS(SCTP_MIB_OUTORDERCHUNKS); 338 SCTP_INC_STATS(SCTP_MIB_OUTORDERCHUNKS);
339 q->empty = 0; 339 q->empty = 0;
340 break; 340 break;
341 }; 341 }
342 } else { 342 } else {
343 list_add_tail(&chunk->list, &q->control_chunk_list); 343 list_add_tail(&chunk->list, &q->control_chunk_list);
344 SCTP_INC_STATS(SCTP_MIB_OUTCTRLCHUNKS); 344 SCTP_INC_STATS(SCTP_MIB_OUTCTRLCHUNKS);
@@ -630,7 +630,7 @@ static int sctp_outq_flush_rtx(struct sctp_outq *q, struct sctp_packet *pkt,
630 /* Retrieve a new chunk to bundle. */ 630 /* Retrieve a new chunk to bundle. */
631 lchunk = sctp_list_dequeue(lqueue); 631 lchunk = sctp_list_dequeue(lqueue);
632 break; 632 break;
633 }; 633 }
634 634
635 /* If we are here due to a retransmit timeout or a fast 635 /* If we are here due to a retransmit timeout or a fast
636 * retransmit and if there are any chunks left in the retransmit 636 * 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)
779 default: 779 default:
780 /* We built a chunk with an illegal type! */ 780 /* We built a chunk with an illegal type! */
781 BUG(); 781 BUG();
782 }; 782 }
783 } 783 }
784 784
785 /* Is it OK to send data chunks? */ 785 /* Is it OK to send data chunks? */
@@ -1397,7 +1397,7 @@ static void sctp_check_transmitted(struct sctp_outq *q,
1397 SCTP_DEBUG_PRINTK("ACKed: %08x", tsn); 1397 SCTP_DEBUG_PRINTK("ACKed: %08x", tsn);
1398 dbg_prt_state = 0; 1398 dbg_prt_state = 0;
1399 dbg_ack_tsn = tsn; 1399 dbg_ack_tsn = tsn;
1400 }; 1400 }
1401 1401
1402 dbg_last_ack_tsn = tsn; 1402 dbg_last_ack_tsn = tsn;
1403#endif /* SCTP_DEBUG */ 1403#endif /* SCTP_DEBUG */
@@ -1452,7 +1452,7 @@ static void sctp_check_transmitted(struct sctp_outq *q,
1452 SCTP_DEBUG_PRINTK("KEPT: %08x",tsn); 1452 SCTP_DEBUG_PRINTK("KEPT: %08x",tsn);
1453 dbg_prt_state = 1; 1453 dbg_prt_state = 1;
1454 dbg_kept_tsn = tsn; 1454 dbg_kept_tsn = tsn;
1455 }; 1455 }
1456 1456
1457 dbg_last_kept_tsn = tsn; 1457 dbg_last_kept_tsn = tsn;
1458#endif /* SCTP_DEBUG */ 1458#endif /* SCTP_DEBUG */
@@ -1476,7 +1476,7 @@ static void sctp_check_transmitted(struct sctp_outq *q,
1476 } else { 1476 } else {
1477 SCTP_DEBUG_PRINTK("\n"); 1477 SCTP_DEBUG_PRINTK("\n");
1478 } 1478 }
1479 }; 1479 }
1480#endif /* SCTP_DEBUG */ 1480#endif /* SCTP_DEBUG */
1481 if (transport) { 1481 if (transport) {
1482 if (bytes_acked) { 1482 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,
2077 2077
2078 default: /* Just ignore anything else. */ 2078 default: /* Just ignore anything else. */
2079 break; 2079 break;
2080 }; 2080 }
2081 } 2081 }
2082 break; 2082 break;
2083 2083
@@ -2118,7 +2118,7 @@ static int sctp_process_param(struct sctp_association *asoc,
2118 SCTP_DEBUG_PRINTK("Ignoring param: %d for association %p.\n", 2118 SCTP_DEBUG_PRINTK("Ignoring param: %d for association %p.\n",
2119 ntohs(param.p->type), asoc); 2119 ntohs(param.p->type), asoc);
2120 break; 2120 break;
2121 }; 2121 }
2122 2122
2123 return retval; 2123 return retval;
2124} 2124}
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,
1009 status, state, event_type, subtype.chunk); 1009 status, state, event_type, subtype.chunk);
1010 BUG(); 1010 BUG();
1011 break; 1011 break;
1012 }; 1012 }
1013 1013
1014bail: 1014bail:
1015 return error; 1015 return error;
@@ -1489,7 +1489,8 @@ static int sctp_cmd_interpreter(sctp_event_t event_type,
1489 printk(KERN_WARNING "Impossible command: %u, %p\n", 1489 printk(KERN_WARNING "Impossible command: %u, %p\n",
1490 cmd->verb, cmd->obj.ptr); 1490 cmd->verb, cmd->obj.ptr);
1491 break; 1491 break;
1492 }; 1492 }
1493
1493 if (error) 1494 if (error)
1494 break; 1495 break;
1495 } 1496 }
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,
629 case -SCTP_IERROR_BAD_SIG: 629 case -SCTP_IERROR_BAD_SIG:
630 default: 630 default:
631 return sctp_sf_pdiscard(ep, asoc, type, arg, commands); 631 return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
632 }; 632 }
633 } 633 }
634 634
635 635
@@ -1195,7 +1195,7 @@ static void sctp_tietags_populate(struct sctp_association *new_asoc,
1195 new_asoc->c.my_ttag = asoc->c.my_vtag; 1195 new_asoc->c.my_ttag = asoc->c.my_vtag;
1196 new_asoc->c.peer_ttag = asoc->c.peer_vtag; 1196 new_asoc->c.peer_ttag = asoc->c.peer_vtag;
1197 break; 1197 break;
1198 }; 1198 }
1199 1199
1200 /* Other parameters for the endpoint SHOULD be copied from the 1200 /* Other parameters for the endpoint SHOULD be copied from the
1201 * existing parameters of the association (e.g. number of 1201 * 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,
1904 case -SCTP_IERROR_BAD_SIG: 1904 case -SCTP_IERROR_BAD_SIG:
1905 default: 1905 default:
1906 return sctp_sf_pdiscard(ep, asoc, type, arg, commands); 1906 return sctp_sf_pdiscard(ep, asoc, type, arg, commands);
1907 }; 1907 }
1908 } 1908 }
1909 1909
1910 /* Compare the tie_tag in cookie with the verification tag of 1910 /* 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,
1936 default: /* Discard packet for all others. */ 1936 default: /* Discard packet for all others. */
1937 retval = sctp_sf_pdiscard(ep, asoc, type, arg, commands); 1937 retval = sctp_sf_pdiscard(ep, asoc, type, arg, commands);
1938 break; 1938 break;
1939 }; 1939 }
1940 1940
1941 /* Delete the tempory new association. */ 1941 /* Delete the tempory new association. */
1942 sctp_add_cmd_sf(commands, SCTP_CMD_NEW_ASOC, SCTP_ASOC(new_asoc)); 1942 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,
4816 default: 4816 default:
4817 BUG(); 4817 BUG();
4818 break; 4818 break;
4819 }; 4819 }
4820 4820
4821 if (!reply) 4821 if (!reply)
4822 goto nomem; 4822 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,
101 default: 101 default:
102 /* Yikes! We got an illegal event type. */ 102 /* Yikes! We got an illegal event type. */
103 return &bug; 103 return &bug;
104 }; 104 }
105} 105}
106 106
107#define TYPE_SCTP_FUNC(func) {.fn = func, .name = #func} 107#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,
941 default: 941 default:
942 err = -EINVAL; 942 err = -EINVAL;
943 break; 943 break;
944 }; 944 }
945 945
946out: 946out:
947 kfree(kaddrs); 947 kfree(kaddrs);
@@ -3048,7 +3048,7 @@ SCTP_STATIC int sctp_setsockopt(struct sock *sk, int level, int optname,
3048 default: 3048 default:
3049 retval = -ENOPROTOOPT; 3049 retval = -ENOPROTOOPT;
3050 break; 3050 break;
3051 }; 3051 }
3052 3052
3053 sctp_release_sock(sk); 3053 sctp_release_sock(sk);
3054 3054
@@ -4873,7 +4873,7 @@ SCTP_STATIC int sctp_getsockopt(struct sock *sk, int level, int optname,
4873 default: 4873 default:
4874 retval = -ENOPROTOOPT; 4874 retval = -ENOPROTOOPT;
4875 break; 4875 break;
4876 }; 4876 }
4877 4877
4878 sctp_release_sock(sk); 4878 sctp_release_sock(sk);
4879 return retval; 4879 return retval;
@@ -5198,7 +5198,8 @@ int sctp_inet_listen(struct socket *sock, int backlog)
5198 break; 5198 break;
5199 default: 5199 default:
5200 break; 5200 break;
5201 }; 5201 }
5202
5202 if (err) 5203 if (err)
5203 goto cleanup; 5204 goto cleanup;
5204 5205
@@ -5461,7 +5462,7 @@ SCTP_STATIC int sctp_msghdr_parse(const struct msghdr *msg,
5461 5462
5462 default: 5463 default:
5463 return -EINVAL; 5464 return -EINVAL;
5464 }; 5465 }
5465 } 5466 }
5466 return 0; 5467 return 0;
5467} 5468}
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,
507 transport->cwnd = max(transport->cwnd/2, 507 transport->cwnd = max(transport->cwnd/2,
508 4*transport->asoc->pathmtu); 508 4*transport->asoc->pathmtu);
509 break; 509 break;
510 }; 510 }
511 511
512 transport->partial_bytes_acked = 0; 512 transport->partial_bytes_acked = 0;
513 SCTP_DEBUG_PRINTK("%s: transport: %p reason: %d cwnd: " 513 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
391 break; 391 break;
392 pos->next = pnext; 392 pos->next = pnext;
393 pos = pnext; 393 pos = pnext;
394 }; 394 }
395 395
396 event = sctp_skb2event(f_frag); 396 event = sctp_skb2event(f_frag);
397 SCTP_INC_STATS(SCTP_MIB_REASMUSRMSGS); 397 SCTP_INC_STATS(SCTP_MIB_REASMUSRMSGS);
@@ -476,7 +476,7 @@ static inline struct sctp_ulpevent *sctp_ulpq_retrieve_reassembled(struct sctp_u
476 else 476 else
477 first_frag = NULL; 477 first_frag = NULL;
478 break; 478 break;
479 }; 479 }
480 } 480 }
481 481
482 asoc = ulpq->asoc; 482 asoc = ulpq->asoc;
@@ -556,7 +556,7 @@ static inline struct sctp_ulpevent *sctp_ulpq_retrieve_partial(struct sctp_ulpq
556 goto done; 556 goto done;
557 default: 557 default:
558 return NULL; 558 return NULL;
559 }; 559 }
560 } 560 }
561 561
562 /* We have the reassembled event. There is no need to look 562 /* 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
648 break; 648 break;
649 default: 649 default:
650 return NULL; 650 return NULL;
651 }; 651 }
652 } 652 }
653 653
654 /* We have the reassembled event. There is no need to look 654 /* We have the reassembled event. There is no need to look
diff --git a/net/tipc/link.c b/net/tipc/link.c
index f3f99c8ea08a..2124f32ef29f 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -2570,7 +2570,7 @@ void tipc_link_recv_bundle(struct sk_buff *buf)
2570 if (obuf == NULL) { 2570 if (obuf == NULL) {
2571 warn("Link unable to unbundle message(s)\n"); 2571 warn("Link unable to unbundle message(s)\n");
2572 break; 2572 break;
2573 }; 2573 }
2574 pos += align(msg_size(buf_msg(obuf))); 2574 pos += align(msg_size(buf_msg(obuf)));
2575 msg_dbg(buf_msg(obuf), " /"); 2575 msg_dbg(buf_msg(obuf), " /");
2576 tipc_net_route_msg(obuf); 2576 tipc_net_route_msg(obuf);
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 194257554553..762926009c04 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1049,7 +1049,7 @@ static inline int policy_to_flow_dir(int dir)
1049 return FLOW_DIR_OUT; 1049 return FLOW_DIR_OUT;
1050 case XFRM_POLICY_FWD: 1050 case XFRM_POLICY_FWD:
1051 return FLOW_DIR_FWD; 1051 return FLOW_DIR_FWD;
1052 }; 1052 }
1053} 1053}
1054 1054
1055static struct xfrm_policy *xfrm_sk_policy_lookup(struct sock *sk, int dir, struct flowi *fl) 1055static struct xfrm_policy *xfrm_sk_policy_lookup(struct sock *sk, int dir, struct flowi *fl)
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 69a3600afd9d..743f07e7f698 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -458,7 +458,7 @@ static struct xfrm_state *__xfrm_state_lookup(xfrm_address_t *daddr, __be32 spi,
458 x->id.daddr.a6)) 458 x->id.daddr.a6))
459 continue; 459 continue;
460 break; 460 break;
461 }; 461 }
462 462
463 xfrm_state_hold(x); 463 xfrm_state_hold(x);
464 return x; 464 return x;
@@ -493,7 +493,7 @@ static struct xfrm_state *__xfrm_state_lookup_byaddr(xfrm_address_t *daddr, xfrm
493 x->props.saddr.a6)) 493 x->props.saddr.a6))
494 continue; 494 continue;
495 break; 495 break;
496 }; 496 }
497 497
498 xfrm_state_hold(x); 498 xfrm_state_hold(x);
499 return x; 499 return x;
@@ -722,7 +722,7 @@ static struct xfrm_state *__find_acq_core(unsigned short family, u8 mode, u32 re
722 (struct in6_addr *)saddr)) 722 (struct in6_addr *)saddr))
723 continue; 723 continue;
724 break; 724 break;
725 }; 725 }
726 726
727 xfrm_state_hold(x); 727 xfrm_state_hold(x);
728 return x; 728 return x;
@@ -755,7 +755,7 @@ static struct xfrm_state *__find_acq_core(unsigned short family, u8 mode, u32 re
755 ipv6_addr_copy((struct in6_addr *)x->id.daddr.a6, 755 ipv6_addr_copy((struct in6_addr *)x->id.daddr.a6,
756 (struct in6_addr *)daddr); 756 (struct in6_addr *)daddr);
757 break; 757 break;
758 }; 758 }
759 759
760 x->km.state = XFRM_STATE_ACQ; 760 x->km.state = XFRM_STATE_ACQ;
761 x->id.proto = proto; 761 x->id.proto = proto;
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 88659edc9b1a..f91521d5f2ab 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -71,7 +71,7 @@ static int verify_one_alg(struct rtattr **xfrma, enum xfrm_attr_type_t type)
71 71
72 default: 72 default:
73 return -EINVAL; 73 return -EINVAL;
74 }; 74 }
75 75
76 algp->alg_name[CRYPTO_MAX_ALG_NAME - 1] = '\0'; 76 algp->alg_name[CRYPTO_MAX_ALG_NAME - 1] = '\0';
77 return 0; 77 return 0;
@@ -152,7 +152,7 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
152 152
153 default: 153 default:
154 goto out; 154 goto out;
155 }; 155 }
156 156
157 err = -EINVAL; 157 err = -EINVAL;
158 switch (p->id.proto) { 158 switch (p->id.proto) {
@@ -192,7 +192,7 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
192 192
193 default: 193 default:
194 goto out; 194 goto out;
195 }; 195 }
196 196
197 if ((err = verify_one_alg(xfrma, XFRMA_ALG_AUTH))) 197 if ((err = verify_one_alg(xfrma, XFRMA_ALG_AUTH)))
198 goto out; 198 goto out;
@@ -217,7 +217,7 @@ static int verify_newsa_info(struct xfrm_usersa_info *p,
217 217
218 default: 218 default:
219 goto out; 219 goto out;
220 }; 220 }
221 221
222 err = 0; 222 err = 0;
223 223
@@ -711,7 +711,7 @@ static int verify_userspi_info(struct xfrm_userspi_info *p)
711 711
712 default: 712 default:
713 return -EINVAL; 713 return -EINVAL;
714 }; 714 }
715 715
716 if (p->min > p->max) 716 if (p->min > p->max)
717 return -EINVAL; 717 return -EINVAL;
@@ -789,7 +789,7 @@ static int verify_policy_dir(u8 dir)
789 789
790 default: 790 default:
791 return -EINVAL; 791 return -EINVAL;
792 }; 792 }
793 793
794 return 0; 794 return 0;
795} 795}
@@ -805,7 +805,7 @@ static int verify_policy_type(u8 type)
805 805
806 default: 806 default:
807 return -EINVAL; 807 return -EINVAL;
808 }; 808 }
809 809
810 return 0; 810 return 0;
811} 811}
@@ -821,7 +821,7 @@ static int verify_newpolicy_info(struct xfrm_userpolicy_info *p)
821 821
822 default: 822 default:
823 return -EINVAL; 823 return -EINVAL;
824 }; 824 }
825 825
826 switch (p->action) { 826 switch (p->action) {
827 case XFRM_POLICY_ALLOW: 827 case XFRM_POLICY_ALLOW:
@@ -830,7 +830,7 @@ static int verify_newpolicy_info(struct xfrm_userpolicy_info *p)
830 830
831 default: 831 default:
832 return -EINVAL; 832 return -EINVAL;
833 }; 833 }
834 834
835 switch (p->sel.family) { 835 switch (p->sel.family) {
836 case AF_INET: 836 case AF_INET:
@@ -845,7 +845,7 @@ static int verify_newpolicy_info(struct xfrm_userpolicy_info *p)
845 845
846 default: 846 default:
847 return -EINVAL; 847 return -EINVAL;
848 }; 848 }
849 849
850 return verify_policy_dir(p->dir); 850 return verify_policy_dir(p->dir);
851} 851}
@@ -912,7 +912,7 @@ static int validate_tmpl(int nr, struct xfrm_user_tmpl *ut, u16 family)
912#endif 912#endif
913 default: 913 default:
914 return -EINVAL; 914 return -EINVAL;
915 }; 915 }
916 } 916 }
917 917
918 return 0; 918 return 0;