From 216ac4dd25d9af1d5ef21f70e7f5bbe4efc99a37 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 3 Feb 2006 01:45:12 -0800 Subject: [PATCH] --- yaml --- r: 21239 b: refs/heads/master c: fe9313956d67367cc91c5a6989bafc4315801402 h: refs/heads/master i: 21237: 4886b8dd4e36e3c43d3fc394d0e0166d58249f7c 21235: 19be0ef70651ea346dac9fe59a7974546be9768e 21231: 1976ec10dd892130f0e9bd4a32a90594d594e631 v: v3 --- [refs] | 2 +- trunk/drivers/net/s2io.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 43cf2aaf9d15..fd389b396092 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d3d0439f574a4857c97b3ad2e63b082b7382d7e +refs/heads/master: fe9313956d67367cc91c5a6989bafc4315801402 diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c index 4e392914971e..e7a9b0d32a18 100644 --- a/trunk/drivers/net/s2io.c +++ b/trunk/drivers/net/s2io.c @@ -64,6 +64,7 @@ #include #include #include +#include /* local include */ #include "s2io.h" @@ -5110,6 +5111,7 @@ static void s2io_get_ethtool_stats(struct net_device *dev, int i = 0; nic_t *sp = dev->priv; StatInfo_t *stat_info = sp->mac_control.stats_info; + u64 tmp; s2io_updt_stats(sp); tmp_stats[i++] = @@ -5205,12 +5207,12 @@ static void s2io_get_ethtool_stats(struct net_device *dev, tmp_stats[i++] = stat_info->sw_stat.sending_both; tmp_stats[i++] = stat_info->sw_stat.outof_sequence_pkts; tmp_stats[i++] = stat_info->sw_stat.flush_max_pkts; - if (stat_info->sw_stat.num_aggregations) - tmp_stats[i++] = stat_info->sw_stat.sum_avg_pkts_aggregated / - stat_info->sw_stat.num_aggregations; - else - tmp_stats[i++] = 0; - + tmp = 0; + if (stat_info->sw_stat.num_aggregations) { + tmp = stat_info->sw_stat.sum_avg_pkts_aggregated; + do_div(tmp, stat_info->sw_stat.num_aggregations); + } + tmp_stats[i++] = tmp; } static int s2io_ethtool_get_regs_len(struct net_device *dev)