summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/intel/igb/igb_main.c
diff options
context:
space:
mode:
authorDominik Sliwa <dominik.sliwa@toradex.com>2018-09-12 17:28:23 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-09-27 18:11:39 +0200
commitba29b069a970c97be7255b3f42176be620f6ea70 (patch)
tree907cb5e36d1eebdf4b80da96ff4f1cc5a4db1ae9 /drivers/net/ethernet/intel/igb/igb_main.c
parent652ce8cfde72ff52075916c6008e86d08898636d (diff)
net: igb: implement SIOCSMIIREG and allow SIOCGMIIREG to set pagesApalis-TK1_LXDE-Image_2.8b4.129-20181005
Before SIOCGMIIREG was only able to access page 0 registers. Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 4f9ffcab4484..d22f555201a6 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -8662,6 +8662,7 @@ void igb_alloc_rx_buffers(struct igb_ring *rx_ring, u16 cleaned_count)
}
#ifdef SIOCGMIIPHY
+
/**
* igb_mii_ioctl -
* @netdev:
@@ -8683,11 +8684,15 @@ static int igb_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
case SIOCGMIIREG:
if (!capable(CAP_NET_ADMIN))
return -EPERM;
- if (e1000_read_phy_reg(&adapter->hw, data->reg_num & 0x1F,
- &data->val_out))
+ if (e1000_read_phy_reg_no_page(&adapter->hw, data->reg_num,
+ &data->val_out))
return -EIO;
break;
case SIOCSMIIREG:
+ if (e1000_write_phy_reg_no_page(&adapter->hw, data->reg_num,
+ data->val_in))
+ return -EIO;
+ break;
default:
return -EOPNOTSUPP;
}