From 4db845292f95044e6655551ddb52abcc1e1a915e Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 22 Dec 2007 18:56:53 +0000 Subject: [PATCH] --- yaml --- r: 75173 b: refs/heads/master c: cc154ac64aa8d3396b187f64cef01ce67f433324 h: refs/heads/master i: 75171: c81ff4da54bd66f8bfe245c7741f2188fb8ed40e v: v3 --- [refs] | 2 +- trunk/drivers/net/fec_mpc52xx.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6b4a906ebd23..65727fcf9f88 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1e247ad8e4ff29b5c7fa2b9a081b4a0f483b0d3 +refs/heads/master: cc154ac64aa8d3396b187f64cef01ce67f433324 diff --git a/trunk/drivers/net/fec_mpc52xx.c b/trunk/drivers/net/fec_mpc52xx.c index 79f7eade4773..f91ee700e605 100644 --- a/trunk/drivers/net/fec_mpc52xx.c +++ b/trunk/drivers/net/fec_mpc52xx.c @@ -568,8 +568,9 @@ static void mpc52xx_fec_reset_stats(struct net_device *dev) struct mpc52xx_fec __iomem *fec = priv->fec; out_be32(&fec->mib_control, FEC_MIB_DISABLE); - memset_io(&fec->rmon_t_drop, 0, (__force u32)&fec->reserved10 - - (__force u32)&fec->rmon_t_drop); + memset_io(&fec->rmon_t_drop, 0, + offsetof(struct mpc52xx_fec, reserved10) - + offsetof(struct mpc52xx_fec, rmon_t_drop)); out_be32(&fec->mib_control, 0); memset(&dev->stats, 0, sizeof(dev->stats));