diff options
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/fib_semantics.c | 2 | ||||
-rw-r--r-- | net/ipv4/ipconfig.c | 4 | ||||
-rw-r--r-- | net/ipv4/multipath_drr.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp.c | 7 | ||||
-rw-r--r-- | net/ipv4/tcp_input.c | 9 | ||||
-rw-r--r-- | net/ipv4/xfrm4_policy.c | 2 |
6 files changed, 14 insertions, 12 deletions
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; |