From 731a05a6b236668e93897db82d1b754fe3db6c7a Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Thu, 29 Jan 2009 17:32:20 -0800 Subject: [PATCH] --- yaml --- r: 130503 b: refs/heads/master c: c25b9abbc2c2c0da88e180c3933d6e773245815a h: refs/heads/master i: 130501: 94a21276c726bf0e2b2cbfbe6ecff8a9fb180fe3 130499: 15457e197d46ae1f385a2b3b800abd4adf7c17a2 130495: c9f92b8a7368ac495837f45d7da819c5961e96a9 v: v3 --- [refs] | 2 +- trunk/drivers/net/skfp/skfddi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6dab01823fb8..e0a2cb785305 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5664bb2a7fd8ae1bee1281c2e44653c471af9ca +refs/heads/master: c25b9abbc2c2c0da88e180c3933d6e773245815a diff --git a/trunk/drivers/net/skfp/skfddi.c b/trunk/drivers/net/skfp/skfddi.c index 607efeaf0bc5..9a00e5566af7 100644 --- a/trunk/drivers/net/skfp/skfddi.c +++ b/trunk/drivers/net/skfp/skfddi.c @@ -1003,9 +1003,9 @@ static int skfp_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) break; case SKFP_CLR_STATS: /* Zero out the driver statistics */ if (!capable(CAP_NET_ADMIN)) { - memset(&lp->MacStat, 0, sizeof(lp->MacStat)); - } else { status = -EPERM; + } else { + memset(&lp->MacStat, 0, sizeof(lp->MacStat)); } break; default: