diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-04 16:58:26 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-04 16:58:26 -0800 |
| commit | 327641da8e3e227f42690479182b896fd19486be (patch) | |
| tree | 05fa7f317e854f2da5d46d4c8977486d71bb2b21 /drivers/net/skfp/skfddi.c | |
| parent | 1f4f931501e9270c156d05ee76b7b872de486304 (diff) | |
| parent | ef3892bd63420380d115f755d351d2071f1f805f (diff) | |
Merge branch 'core/percpu' into x86/paravirt
Diffstat (limited to 'drivers/net/skfp/skfddi.c')
| -rw-r--r-- | drivers/net/skfp/skfddi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index 607efeaf0bc..9a00e5566af 100644 --- a/drivers/net/skfp/skfddi.c +++ b/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: |