Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

[~andy/linux] / drivers / net / mii.c

diff --git a/drivers/net/mii.c b/drivers/net/mii.c
index d81a5d22a3a9f0dd88514753ce62649255691380..210b2b164b303b9283e11c5d7802571f108ef29c 100644 (file)
--- a/drivers/net/mii.c
+++ b/drivers/net/mii.c
@@ -433,9 +433,6 @@ int generic_mii_ioctl(struct mii_if_info *mii_if,
        case SIOCSMIIREG: {
                u16 val = mii_data->val_in;
 
-               if (!capable(CAP_NET_ADMIN))
-                       return -EPERM;
-
                if (mii_data->phy_id == mii_if->phy_id) {
                        switch(mii_data->reg_num) {
                        case MII_BMCR: {