git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
libertas: make __lbs_cmd_async() non-static
[safe/jmp/linux-2.6]
/
drivers
/
net
/
sungem.c
diff --git
a/drivers/net/sungem.c
b/drivers/net/sungem.c
index
e0dfdd2
..
305ec3d
100644
(file)
--- a/
drivers/net/sungem.c
+++ b/
drivers/net/sungem.c
@@
-2852,9
+2852,7
@@
static int gem_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
break;
case SIOCSMIIREG: /* Write MII PHY register. */
- if (!capable(CAP_NET_ADMIN))
- rc = -EPERM;
- else if (!gp->running)
+ if (!gp->running)
rc = -EAGAIN;
else {
__phy_write(gp, data->phy_id & 0x1f, data->reg_num & 0x1f,