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/ipv4 | |
| parent | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (diff) | |
Merge with Linux 2.4.0.
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/arp.c | 2 | ||||
| -rw-r--r-- | net/ipv4/netfilter/ipt_LOG.c | 2 | ||||
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 | ||||
| -rw-r--r-- | net/ipv4/tcp_timer.c | 2 | ||||
| -rw-r--r-- | net/ipv4/udp.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index b410d1de4..51592202a 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@ -292,7 +292,7 @@ static int arp_constructor(struct neighbour *neigh) neigh->output = neigh->ops->output; return 0; #endif - } + ;} #endif if (neigh->type == RTN_MULTICAST) { neigh->nud_state = NUD_NOARP; diff --git a/net/ipv4/netfilter/ipt_LOG.c b/net/ipv4/netfilter/ipt_LOG.c index bdb4fd99c..c7f9dfe37 100644 --- a/net/ipv4/netfilter/ipt_LOG.c +++ b/net/ipv4/netfilter/ipt_LOG.c @@ -288,7 +288,7 @@ ipt_log_target(struct sk_buff **pskb, if (in && !out) { /* MAC logging for input chain only. */ printk("MAC="); - if ((*pskb)->dev && (*pskb)->dev->hard_header_len && (*pskb)->mac.raw != iph) { + if ((*pskb)->dev && (*pskb)->dev->hard_header_len && (*pskb)->mac.raw != (void*)iph) { int i; unsigned char *p = (*pskb)->mac.raw; for (i = 0; i < (*pskb)->dev->hard_header_len; i++,p++) diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index c2cc4815b..bbc8668d8 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1707,7 +1707,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/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index f57aeb32e..27815dcb7 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -384,7 +384,7 @@ static void tcp_retransmit_timer(struct sock *sk) if (tp->retransmits > sysctl_tcp_retries1) __sk_dst_reset(sk); -out: +out:; } static void tcp_write_timer(unsigned long data) diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index a4ff40d56..3d177c7c9 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -158,7 +158,7 @@ static int udp_v4_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) { |