patch-2.4.0-test3 linux/include/net/ip.h

Next file: linux/include/net/ipv6.h
Previous file: linux/include/net/inet_ecn.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test2/linux/include/net/ip.h linux/include/net/ip.h
@@ -167,12 +167,14 @@
 		return ip_finish_output(skb);
 }
 
+/* The function in 2.2 was invalid, producing wrong result for
+ * check=0xFEFF. It was noticed by Arthur Skawina _year_ ago. --ANK(000625) */
 extern __inline__
 int ip_decrease_ttl(struct iphdr *iph)
 {
 	u32 check = iph->check;
 	check += __constant_htons(0x0100);
-	iph->check = check + (check>>16);
+	iph->check = check + (check>=0xFFFF);
 	return --iph->ttl;
 }
 
@@ -220,6 +222,8 @@
  */
  
 struct sk_buff *ip_defrag(struct sk_buff *skb);
+extern int ip_frag_nqueues;
+extern atomic_t ip_frag_mem;
 
 /*
  *	Functions provided by ip_forward.c

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)