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/hamradio/scc.c | |
| parent | f01bd7aeafd95a08aafc9e3636bb26974df69d82 (diff) | |
Merge with 2.3.99-pre1.
Diffstat (limited to 'drivers/net/hamradio/scc.c')
| -rw-r--r-- | drivers/net/hamradio/scc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index 09bb422f1..c7f27414f 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c @@ -1791,7 +1791,7 @@ static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) { int found = 1; - if (!suser()) return -EPERM; + if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (!arg) return -EFAULT; if (Nchips >= SCC_MAXCHIPS) @@ -1887,7 +1887,7 @@ static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) if (cmd == SIOCSCCINI) { - if (!suser()) + if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (Nchips == 0) @@ -1904,7 +1904,7 @@ static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) { if (cmd == SIOCSCCCHANINI) { - if (!suser()) return -EPERM; + if (!capable(CAP_NET_ADMIN)) return -EPERM; if (!arg) return -EINVAL; scc->stat.bufsize = SCC_BUFSIZE; @@ -1957,7 +1957,7 @@ static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) return -ENOIOCTLCMD; case SIOCSCCSMEM: - if (!suser()) return -EPERM; + if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (!arg || copy_from_user(&memcfg, arg, sizeof(memcfg))) return -EINVAL; scc->stat.bufsize = memcfg.bufsize; @@ -1977,13 +1977,13 @@ static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) return 0; case SIOCSCCSKISS: - if (!suser()) return -EPERM; + if (!capable(CAP_NET_ADMIN)) return -EPERM; if (!arg || copy_from_user(&kiss_cmd, arg, sizeof(kiss_cmd))) return -EINVAL; return scc_set_param(scc, kiss_cmd.command, kiss_cmd.param); case SIOCSCCCAL: - if (!suser()) return -EPERM; + if (!capable(CAP_SYS_RAWIO)) return -EPERM; if (!arg || copy_from_user(&cal, arg, sizeof(cal)) || cal.time == 0) return -EINVAL; |