diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-15 14:18:15 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-15 14:18:15 +0400 |
| commit | dca2d6ac09d9ef59ff46820d4f0c94b08a671202 (patch) | |
| tree | fdec753b842dad09e3a4151954fab3eb5c43500d /drivers/net/mii.c | |
| parent | d6a65dffb30d8636b1e5d4c201564ef401a246cf (diff) | |
| parent | 18240904960a39e582ced8ba8ececb10b8c22dd3 (diff) | |
| download | linux-dca2d6ac09d9ef59ff46820d4f0c94b08a671202.tar.xz | |
Merge branch 'linus' into tracing/hw-breakpoints
Conflicts:
arch/x86/kernel/process_64.c
Semantic conflict fixed in:
arch/x86/kvm/x86.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/mii.c')
| -rw-r--r-- | drivers/net/mii.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/mii.c b/drivers/net/mii.c index d81a5d22a3a9..210b2b164b30 100644 --- 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: { |