patch-2.4.0-test12 linux/net/ipv6/raw.c

• Lines: 34
• Date: Tue Nov 28 21:53:45 2000
• Orig file: v2.4.0-test11/linux/net/ipv6/raw.c
• Orig date: Tue Oct 31 12:42:27 2000

diff -u --recursive --new-file v2.4.0-test11/linux/net/ipv6/raw.c linux/net/ipv6/raw.c
@@ -7,7 +7,7 @@
  *
  *	Adapted from linux/net/ipv4/raw.c
  *
- *	$Id: raw.c,v 1.41 2000/10/18 18:04:23 davem Exp $
+ *	$Id: raw.c,v 1.42 2000/11/28 13:38:38 davem Exp $
  *
  *	Fixes:
  *	Hideaki YOSHIFUJI	:	sin6_scope_id support
@@ -743,15 +743,11 @@
 {
 	struct in6_addr *dest, *src;
 	__u16 destp, srcp;
-	int sock_timer_active;
-	unsigned long timer_expires;
 
 	dest  = &sp->net_pinfo.af_inet6.daddr;
 	src   = &sp->net_pinfo.af_inet6.rcv_saddr;
 	destp = 0;
 	srcp  = sp->num;
-	sock_timer_active = timer_pending(&sp->timer) ? 2 : 0;
-	timer_expires = (sock_timer_active == 2 ? sp->timer.expires : jiffies);
 	sprintf(tmpbuf,
 		"%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X "
 		"%02X %08X:%08X %02X:%08lX %08X %5d %8d %ld %d %p",
@@ -762,7 +758,7 @@
 		dest->s6_addr32[2], dest->s6_addr32[3], destp,
 		sp->state, 
 		atomic_read(&sp->wmem_alloc), atomic_read(&sp->rmem_alloc),
-		sock_timer_active, timer_expires-jiffies, 0,
+		0, 0L, 0,
 		sock_i_uid(sp), 0,
 		sock_i_ino(sp),
 		atomic_read(&sp->refcnt), sp);