patch-2.1.36 linux/include/linux/skbuff.h

Next file: linux/include/linux/sysctl.h
Previous file: linux/include/linux/sched.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.35/linux/include/linux/skbuff.h linux/include/linux/skbuff.h
@@ -20,12 +20,9 @@
 #include <asm/atomic.h>
 #include <asm/types.h>
 
-#define CONFIG_SKB_CHECK 0
-
 #define HAVE_ALLOC_SKB		/* For the drivers to know */
 #define HAVE_ALIGNABLE_SKB	/* Ditto 8)		   */
 
-
 #define FREE_READ	1
 #define FREE_WRITE	0
 
@@ -39,9 +36,6 @@
 	struct sk_buff	* prev;
 	__u32		qlen;		/* Must be same length as a pointer
 					   for using debugging */
-#if CONFIG_SKB_CHECK
-	int		magic_debug_cookie;
-#endif
 };
 
 struct sk_buff 
@@ -49,9 +43,6 @@
 	struct sk_buff	* next;			/* Next buffer in list 				*/
 	struct sk_buff	* prev;			/* Previous buffer in list 			*/
 	struct sk_buff_head * list;		/* List we are on				*/
-#if CONFIG_SKB_CHECK
-	int		magic_debug_cookie;
-#endif
 	struct sock	*sk;			/* Socket we are owned by 			*/
 	unsigned long	when;			/* used to compute rtt's			*/
 	struct timeval	stamp;			/* Time we arrived				*/
@@ -95,8 +86,7 @@
   
 	unsigned int 	len;			/* Length of actual data			*/
 	unsigned int	csum;			/* Checksum 					*/
-	volatile char 	acked,			/* Are we acked ?				*/
-			used,			/* Are we in use ?				*/
+	volatile char 	used,			/* Are we in use ?				*/
 			arp;			/* Has IP/ARP resolution finished		*/
 	unsigned char	tries,			/* Times tried					*/
   			inclone,		/* Inline clone					*/
@@ -141,12 +131,6 @@
 #define SK_RMEM_MAX	32767
 #endif
 
-#if CONFIG_SKB_CHECK
-#define SK_FREED_SKB	0x0DE2C0DE
-#define SK_GOOD_SKB	0xDEC0DED1
-#define SK_HEAD_SKB	0x12231298
-#endif
-
 #ifdef __KERNEL__
 /*
  *	Handling routines are only of interest to the kernel
@@ -245,14 +229,6 @@
 	return(list_->qlen);
 }
 
-#if CONFIG_SKB_CHECK
-extern int 			skb_check(struct sk_buff *skb,int,int, char *);
-#define IS_SKB(skb)		skb_check((skb), 0, __LINE__,__FILE__)
-#define IS_SKB_HEAD(skb)	skb_check((skb), 1, __LINE__,__FILE__)
-#else
-#define IS_SKB(skb)		
-#define IS_SKB_HEAD(skb)	
-
 extern __inline__ void skb_queue_head_init(struct sk_buff_head *list)
 {
 	list->prev = (struct sk_buff *)list;
@@ -534,9 +510,6 @@
 	skb->destructor = NULL;
 	skb->sk = NULL;
 }
-
-
-#endif
 
 extern struct sk_buff *		skb_recv_datagram(struct sock *sk,unsigned flags,int noblock, int *err);
 extern unsigned int		datagram_poll(struct socket *sock, poll_table *wait);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov