android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bonding: Remove unnecessary returned value check

Browse Source 
The function bond_info_query alwarys returns 0. As such, in the function
bond_do_ioctl, it is not necessary to check the returned value. So the
interface type of the function bond_info_query is changed to void. The
redundant check is removed.

Signed-off-by: Zhu Yanjun <yanjun.zhu@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Zhu Yanjun
2017-02-02 23:46:21 -05:00
committed by David S. Miller
parent 38ab52e8e1
commit 3d67576da1
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/bonding/bond_main.c
View File

@ -1993,11 +1993,10 @@ static int bond_release_and_destroy(struct net_device *bond_dev,
return ret; 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); struct bonding *bond = netdev_priv(bond_dev);
bond_fill_ifbond(bond, info); bond_fill_ifbond(bond, info);
return 0;
} }
static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *info) 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))) if (copy_from_user(&k_binfo, u_binfo, sizeof(ifbond)))
return -EFAULT; return -EFAULT;
res = bond_info_query(bond_dev, &k_binfo); bond_info_query(bond_dev, &k_binfo);
if (res == 0 && if (copy_to_user(u_binfo, &k_binfo, sizeof(ifbond)))
copy_to_user(u_binfo, &k_binfo, sizeof(ifbond)))
return -EFAULT; return -EFAULT;
return res; return 0;
case BOND_SLAVE_INFO_QUERY_OLD: case BOND_SLAVE_INFO_QUERY_OLD:
case SIOCBONDSLAVEINFOQUERY: case SIOCBONDSLAVEINFOQUERY:
u_sinfo = (struct ifslave __user *)ifr->ifr_data; u_sinfo = (struct ifslave __user *)ifr->ifr_data;