diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /net/ipv6/udp.c | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 5665c3225..4b3bf084b 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -7,7 +7,7 @@ * * Based on linux/ipv4/udp.c * - * $Id: udp.c,v 1.52 2000/04/25 04:13:34 davem Exp $ + * $Id: udp.c,v 1.53 2000/05/03 06:37:07 davem Exp $ * * Fixes: * Hideaki YOSHIFUJI : sin6_scope_id support @@ -901,15 +901,15 @@ static void get_udp6_sock(struct sock *sp, char *tmpbuf, int i) { struct in6_addr *dest, *src; __u16 destp, srcp; - int timer_active; + int sock_timer_active; unsigned long timer_expires; dest = &sp->net_pinfo.af_inet6.daddr; src = &sp->net_pinfo.af_inet6.rcv_saddr; destp = ntohs(sp->dport); srcp = ntohs(sp->sport); - timer_active = (sp->timer.prev != NULL) ? 2 : 0; - timer_expires = (timer_active == 2 ? sp->timer.expires : jiffies); + 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", @@ -920,7 +920,7 @@ static void get_udp6_sock(struct sock *sp, char *tmpbuf, int i) dest->s6_addr32[2], dest->s6_addr32[3], destp, sp->state, atomic_read(&sp->wmem_alloc), atomic_read(&sp->rmem_alloc), - timer_active, timer_expires-jiffies, 0, + sock_timer_active, timer_expires-jiffies, 0, sp->socket->inode->i_uid, 0, sp->socket ? sp->socket->inode->i_ino : 0, atomic_read(&sp->refcnt), sp); |