X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=include%2Fnet%2Ftux.h;h=c22898d8f36b3a251e6ef328e037c78519c7e6ee;hb=477601555fa976e13e6901c5733184d680629f1b;hp=613d14e9662e6cec252e306201296b547b76a89a;hpb=5167311cae6aa3a5ff5afd39f88c32a435c969ef;p=linux-2.6.git

diff --git a/include/net/tux.h b/include/net/tux.h
index 613d14e96..c22898d8f 100644
--- a/include/net/tux.h
+++ b/include/net/tux.h
@@ -19,7 +19,6 @@
 #include <linux/mman.h>
 #include <linux/swap.h>
 #include <linux/ctype.h>
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/unistd.h>
@@ -61,8 +60,7 @@ extern asmlinkage long (*sys_tux_ptr) (unsigned int action, user_req_t *u_info);
 extern int tux_TDprintk;
 extern int tux_Dprintk;
 
-#define TUX_DEBUG CONFIG_TUX_DEBUG
-#if CONFIG_TUX_DEBUG
+#ifdef CONFIG_TUX_DEBUG
 # define TUX_BUG() BUG()
 
 # define TUX_DPRINTK 1
@@ -383,7 +381,7 @@ struct tux_req_struct
 	/* the file being sent */
 
 	unsigned int bytes_sent;
-#if CONFIG_TUX_DEBUG
+#ifdef CONFIG_TUX_DEBUG
 	unsigned int bytes_expected;
 #endif
 	unsigned long first_timestamp;
@@ -422,7 +420,7 @@ struct tux_req_struct
 	void (*ftp_real_create_child)(struct sock *sk, struct sock *newsk);
 	void (*ftp_real_destruct)(struct sock *sk);
 
-#if CONFIG_TUX_EXTENDED_LOG
+#ifdef CONFIG_TUX_EXTENDED_LOG
 	unsigned long accept_timestamp;
 	unsigned long parse_timestamp;
 	unsigned long output_timestamp;
@@ -501,7 +499,7 @@ typedef enum special_mimetypes {
 	MIME_TYPE_MODULE,
 } special_mimetypes_t;
 
-#if CONFIG_TUX_DEBUG
+#ifdef CONFIG_TUX_DEBUG
 #if 0
 extern inline void url_hist_hit (int size)
 {
@@ -514,7 +512,7 @@ extern inline void url_hist_hit (int size)
 extern inline void url_hist_miss (int size)
 {
 	unsigned int idx = size/1024;
- 
+
 	if (idx >= URL_HIST_SIZE)
 		idx = URL_HIST_SIZE-1;
 	kstat.url_hist_misses[idx]++;
@@ -799,4 +797,7 @@ static inline void put_data_sock (tux_req_t *req)
 
 #define tux_close(fd) sys_close(fd)
 
+extern int init_tux_request_slabs(void);
+extern void free_tux_request_slabs(void);
+
 #endif