4 files changed, 7 insertions, 2 deletions
diff --git a/pfinet/linux-src/net/ipv4/arp.c b/pfinet/linux-src/net/ipv4/arp.c
index a9b60afe..53d155a9 100644
--- a/pfinet/linux-src/net/ipv4/arp.c
+++ b/pfinet/linux-src/net/ipv4/arp.c
@@ -274,6 +274,7 @@ static int arp_constructor(struct neighbour *neigh)
 			neigh->output = neigh->ops->output;
 			return 0;
 #endif
+			break;
 		}
 #endif
 		if (neigh->type == RTN_MULTICAST) {
diff --git a/pfinet/linux-src/net/ipv4/route.c b/pfinet/linux-src/net/ipv4/route.c
index 2b114b3e..f4e61b95 100644
--- a/pfinet/linux-src/net/ipv4/route.c
+++ b/pfinet/linux-src/net/ipv4/route.c
@@ -721,6 +721,8 @@ reject_redirect:
 		       "Path = %X -> %X, tos %02x\n",
 		       ntohl(old_gw), dev->name, ntohl(new_gw),
 		       ntohl(saddr), ntohl(daddr), tos);
+#else
+	; /* Do nothing.  */
 #endif
 }
 
diff --git a/pfinet/linux-src/net/ipv4/tcp_ipv4.c b/pfinet/linux-src/net/ipv4/tcp_ipv4.c
index 1864f096..5eabe1b9 100644
--- a/pfinet/linux-src/net/ipv4/tcp_ipv4.c
+++ b/pfinet/linux-src/net/ipv4/tcp_ipv4.c
@@ -228,6 +228,7 @@ static int tcp_v4_get_port(struct sock *sk, unsigned short snum)
 					goto next;
 			break;
 		next:
+			; /* Do nothing.  */
 		} while (--remaining > 0);
 		tcp_port_rover = rover;
 
@@ -592,7 +593,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 		if (usin->sin_family)
 			return(-EAFNOSUPPORT);
 		if (!complained++)
-			printk(KERN_DEBUG "%s forgot to set AF_INET in " __FUNCTION__ "\n", current->comm);
+			printk(KERN_DEBUG "%s forgot to set AF_INET in %s\n", current->comm, __FUNCTION__);
 	}
 
 	nexthop = daddr = usin->sin_addr.s_addr;
@@ -1728,7 +1729,7 @@ int tcp_v4_rcv(struct sk_buff *skb, unsigned short len)
 			goto discard_it;
 		}
 	default:
-		/* CHECKSUM_UNNECESSARY */
+	  	; /* CHECKSUM_UNNECESSARY */
 	}
 
 	if((th->doff * 4) < sizeof(struct tcphdr) ||
diff --git a/pfinet/linux-src/net/ipv4/udp.c b/pfinet/linux-src/net/ipv4/udp.c
index 87ff84ce..1ceb43e4 100644
--- a/pfinet/linux-src/net/ipv4/udp.c
+++ b/pfinet/linux-src/net/ipv4/udp.c
@@ -157,6 +157,7 @@ static int udp_v4_get_port(struct sock *sk, unsigned short snum)
 			best_size_so_far = size;
 			best = result;
 		next:
+			; /* Do nothing.  */
 		}
 		result = best;
 		for(;; result += UDP_HTABLE_SIZE) {