summaryrefslogtreecommitdiff
path: root/drivers/net/tlan.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-12-04 13:03:12 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2008-12-04 13:06:46 +1100
commitcf76a3a7b8292423b127f6c0ecbacac8e65d40ad (patch)
tree8fc46b6d104d5fdc68f5bbf7e380243c6fb5cc19 /drivers/net/tlan.c
parenteabeb7dac4934602a90b14649c07c13eb7e43d90 (diff)
parent3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123 (diff)
Merge commit 'net/master'
Diffstat (limited to 'drivers/net/tlan.c')
-rw-r--r--drivers/net/tlan.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index c41d68761364..055d3429851f 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -1649,8 +1649,6 @@ drop_and_reuse:
}
}
- dev->last_rx = jiffies;
-
return ack;
} /* TLan_HandleRxEOF */