diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-19 01:28:40 +0000 |
commit | 8abb719409c9060a7c0676f76e9182c1e0b8ca46 (patch) | |
tree | b88cc5a6cd513a04a512b7e6215c873c90a1c5dd /drivers/net/skfp | |
parent | f01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff) |
Merge with 2.3.99-pre1.
Diffstat (limited to 'drivers/net/skfp')
-rw-r--r-- | drivers/net/skfp/drvfbi.c | 2 | ||||
-rw-r--r-- | drivers/net/skfp/skfddi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/skfp/drvfbi.c b/drivers/net/skfp/drvfbi.c index e1e48bc91..93533c5ef 100644 --- a/drivers/net/skfp/drvfbi.c +++ b/drivers/net/skfp/drvfbi.c @@ -129,7 +129,7 @@ extern int AIX_vpdReadByte() ; /* * FDDI card reset */ -void card_start(smc) +static void card_start(smc) struct s_smc *smc ; { int i ; diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index 6aceec4d5..b6b112318 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c @@ -1249,7 +1249,7 @@ static int skfp_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) copy_to_user(ioc.data, skfp_ctl_get_stats(dev), ioc.len); break; case SKFP_CLR_STATS: /* Zero out the driver statistics */ - if (suser()) { + if (!capable(CAP_NET_ADMIN)) { memset(&lp->MacStat, 0, sizeof(lp->MacStat)); } else { status = -EPERM; |