patch-2.4.0-test12 linux/include/net/sock.h

• Lines: 27
• Date: Mon Dec 11 16:27:29 2000
• Orig file: v2.4.0-test11/linux/include/net/sock.h
• Orig date: Tue Oct 31 12:42:27 2000

diff -u --recursive --new-file v2.4.0-test11/linux/include/net/sock.h linux/include/net/sock.h
@@ -383,7 +383,8 @@
 	__u32	urg_seq;	/* Seq of received urgent pointer */
 	__u16	urg_data;	/* Saved octet of OOB data and control flags */
 	__u8	pending;	/* Scheduled timer event	*/
-	__u8	__empty;
+	__u8	urg_mode;	/* In urgent mode		*/
+	__u32	snd_up;		/* Urgent pointer		*/
 
 	/* The syn_wait_lock is necessary only to avoid tcp_get_info having
 	 * to grab the main lock sock while browsing the listening hash
@@ -402,7 +403,7 @@
 	struct open_request	*accept_queue;
 	struct open_request	*accept_queue_tail;
 
-	int write_pending;	/* A write to socket waits to start. */
+	int			write_pending;	/* A write to socket waits to start. */
 
 	unsigned int		keepalive_time;	  /* time before keep alive takes place */
 	unsigned int		keepalive_intvl;  /* time interval between keep alive probes */
@@ -1168,6 +1169,7 @@
 	}
 #endif /* CONFIG_FILTER */
 
+	skb->dev = NULL;
 	skb_set_owner_r(skb, sk);
 	skb_queue_tail(&sk->receive_queue, skb);
 	if (!sk->dead)