diff options
| author | Al Viro | 2016-09-04 01:37:25 +0200 |
|---|---|---|
| committer | Al Viro | 2016-09-28 03:15:21 +0200 |
| commit | 4ad41c1e2616a64c9e789d7069b1cb3402d2af3a (patch) | |
| tree | c73a6f76a7eb2243ef1304bfaf2b545d8e31e75e /drivers/net/bonding/bond_main.c | |
| parent | kill __kernel_ds_p off (diff) | |
| download | kernel-qcow2-linux-4ad41c1e2616a64c9e789d7069b1cb3402d2af3a.tar.gz kernel-qcow2-linux-4ad41c1e2616a64c9e789d7069b1cb3402d2af3a.tar.xz kernel-qcow2-linux-4ad41c1e2616a64c9e789d7069b1cb3402d2af3a.zip | |
bonding: quit messing with IOCTL
The only remaining users are issuing SIOCGMIIPHY and SIOCGMIIREG,
neither of which deals with userland pointers. Simply calling
->ndo_do_ioctl() is fine; no messing with set_fs() is needed.
It used to mess with SIOCETHTOOL, which would've needed set_fs(),
but that has been killed in "[NET] ethtool ops are the only way"
9 years ago...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 9599ed6f1213..3892811079d0 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -471,9 +471,9 @@ static int bond_check_dev_link(struct bonding *bond, /* Yes, the mii is overlaid on the ifreq.ifr_ifru */ strncpy(ifr.ifr_name, slave_dev->name, IFNAMSIZ); mii = if_mii(&ifr); - if (IOCTL(slave_dev, &ifr, SIOCGMIIPHY) == 0) { + if (ioctl(slave_dev, &ifr, SIOCGMIIPHY) == 0) { mii->reg_num = MII_BMSR; - if (IOCTL(slave_dev, &ifr, SIOCGMIIREG) == 0) + if (ioctl(slave_dev, &ifr, SIOCGMIIREG) == 0) return mii->val_out & BMSR_LSTATUS; } } |