Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / include / net / ip.h

diff --git a/include/net/ip.h b/include/net/ip.h
index 9d43ac222d1507195905c04ecbc76f4569c8c4c8..9f50d4f1f157de867079b5048be3de494bed280f 100644 (file)
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -331,8 +331,8 @@ enum ip_defrag_users
 };
 
 int ip_defrag(struct sk_buff *skb, u32 user);
-int ip_frag_mem(void);
-int ip_frag_nqueues(void);
+int ip_frag_mem(struct net *net);
+int ip_frag_nqueues(struct net *net);
 
 /*
  *     Functions provided by ip_forward.c