diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
| commit | e47f00743fc4776491344f2c618cc8dc2c23bcbc (patch) | |
| tree | 13e03a113a82a184c51c19c209867cfd3a59b3b9 /net/ipv6 | |
| parent | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (diff) | |
Merge with Linux 2.4.0.
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/addrconf.c | 4 | ||||
| -rw-r--r-- | net/ipv6/icmp.c | 2 | ||||
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 | ||||
| -rw-r--r-- | net/ipv6/udp.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index d342d5642..993165142 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -206,7 +206,7 @@ static void addrconf_mod_timer(struct inet6_ifaddr *ifp, case AC_RS: ifp->timer.function = addrconf_rs_timer; break; - default: + default:; } ifp->timer.expires = jiffies + when; add_timer(&ifp->timer); @@ -2015,7 +2015,7 @@ void __init addrconf_init(void) case ARPHRD_IEEE802_TR: addrconf_dev_config(dev); break; - default: + default:; /* Ignore all other */ } } diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 41ce4b997..0ca0d7f2e 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c @@ -542,7 +542,7 @@ int icmpv6_rcv(struct sk_buff *skb, unsigned long len) ntohs(daddr->in6_u.u6_addr16[7])); goto discard_it; } - default: + default:; /* CHECKSUM_UNNECESSARY */ }; diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 1b0684987..8f452acc1 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1639,7 +1639,7 @@ do_time_wait: break; case TCP_TW_RST: goto no_tcp_socket; - case TCP_TW_SUCCESS: + case TCP_TW_SUCCESS:; } goto discard_it; } diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index fbf0c31f6..429e4052f 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -83,7 +83,7 @@ static int udp_v6_get_port(struct sock *sk, unsigned short snum) } while ((sk = sk->next) != NULL); best_size_so_far = size; best = result; - next: + next:; } result = best; for(;; result += UDP_HTABLE_SIZE) { |