summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Fulghum <paulkf@microgate.com>2005-09-09 13:02:13 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 13:57:33 -0700
commit9661239f7f698ba3a79db5e8ab5bb2f4090663d9 (patch)
treea26280d642eef11d3034a832e21072b1d453a803
parent4a918bc233c8b9537fbc05a8bbb33928a4980cc5 (diff)
[PATCH] synclink.c: add clear stats
Add the ability to clear statistics. Signed-off-by: Paul Fulghum <paulkf@microgate.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/char/synclink.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index 747eb8d18166..26b421b74bb6 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -1814,6 +1814,8 @@ static int startup(struct mgsl_struct * info)
info->pending_bh = 0;
+ memset(&info->icount, 0, sizeof(info->icount));
+
init_timer(&info->tx_timer);
info->tx_timer.data = (unsigned long)info;
info->tx_timer.function = mgsl_tx_timeout;
@@ -2470,12 +2472,12 @@ static int mgsl_get_stats(struct mgsl_struct * info, struct mgsl_icount __user *
printk("%s(%d):mgsl_get_params(%s)\n",
__FILE__,__LINE__, info->device_name);
- COPY_TO_USER(err,user_icount, &info->icount, sizeof(struct mgsl_icount));
- if (err) {
- if ( debug_level >= DEBUG_LEVEL_INFO )
- printk( "%s(%d):mgsl_get_stats(%s) user buffer copy failed\n",
- __FILE__,__LINE__,info->device_name);
- return -EFAULT;
+ if (!user_icount) {
+ memset(&info->icount, 0, sizeof(info->icount));
+ } else {
+ COPY_TO_USER(err, user_icount, &info->icount, sizeof(struct mgsl_icount));
+ if (err)
+ return -EFAULT;
}
return 0;