|
@@ -1993,11 +1993,10 @@ static int bond_release_and_destroy(struct net_device *bond_dev,
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static int bond_info_query(struct net_device *bond_dev, struct ifbond *info)
|
|
|
+static void bond_info_query(struct net_device *bond_dev, struct ifbond *info)
|
|
|
{
|
|
|
struct bonding *bond = netdev_priv(bond_dev);
|
|
|
bond_fill_ifbond(bond, info);
|
|
|
- return 0;
|
|
|
}
|
|
|
|
|
|
static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *info)
|
|
@@ -3409,12 +3408,11 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
|
|
|
if (copy_from_user(&k_binfo, u_binfo, sizeof(ifbond)))
|
|
|
return -EFAULT;
|
|
|
|
|
|
- res = bond_info_query(bond_dev, &k_binfo);
|
|
|
- if (res == 0 &&
|
|
|
- copy_to_user(u_binfo, &k_binfo, sizeof(ifbond)))
|
|
|
+ bond_info_query(bond_dev, &k_binfo);
|
|
|
+ if (copy_to_user(u_binfo, &k_binfo, sizeof(ifbond)))
|
|
|
return -EFAULT;
|
|
|
|
|
|
- return res;
|
|
|
+ return 0;
|
|
|
case BOND_SLAVE_INFO_QUERY_OLD:
|
|
|
case SIOCBONDSLAVEINFOQUERY:
|
|
|
u_sinfo = (struct ifslave __user *)ifr->ifr_data;
|