diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /net/appletalk/aarp.c | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'net/appletalk/aarp.c')
| -rw-r--r-- | net/appletalk/aarp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c index f89f777ce..c67e3fdd0 100644 --- a/net/appletalk/aarp.c +++ b/net/appletalk/aarp.c @@ -1017,7 +1017,10 @@ static int aarp_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_t * cycle during probing of a slow to respond host addr. */ if (a != NULL) + { a->expires_at = jiffies - 1; + mod_timer(&aarp_timer, jiffies + sysctl_aarp_tick_time); + } } if (sa.s_node != ma->s_node) |