renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
Code

i40e: better return values

Browse Source 
As mentioned by Joe Perches, clean up return values in some functions
making sure to have consistent return types, not mixing types.

A couple of Joe's comments suggested returning void, but since
the functions in question are ndo defined, the return values are fixed.
So make a comment in the header that notes this is a function called by
net_device_ops.

v2: fix post increment bug in return

CC: Joe Perches <joe@perches.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Jesse Brandeburg 2013-09-25 23:41:14 +00:00 committed by Jeff Kirsher
parent dcae29be4f
commit 078b587648
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/net/ethernet/intel/i40e/i40e_main.c
View File

@ -1787,6 +1787,8 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)
* i40e_vsi_kill_vlan - Remove vsi membership for given vlan * i40e_vsi_kill_vlan - Remove vsi membership for given vlan
* @vsi: the vsi being configured * @vsi: the vsi being configured
* @vid: vlan id to be removed (0 = untagged only , -1 = any) * @vid: vlan id to be removed (0 = untagged only , -1 = any)
*
* Return: 0 on success or negative otherwise
**/ **/
int i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid) int i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid)
{ {
@ -1860,37 +1862,39 @@ int i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid)
* i40e_vlan_rx_add_vid - Add a vlan id filter to HW offload * i40e_vlan_rx_add_vid - Add a vlan id filter to HW offload
* @netdev: network interface to be adjusted * @netdev: network interface to be adjusted
* @vid: vlan id to be added * @vid: vlan id to be added
*
* net_device_ops implementation for adding vlan ids
**/ **/
static int i40e_vlan_rx_add_vid(struct net_device *netdev, static int i40e_vlan_rx_add_vid(struct net_device *netdev,
__always_unused __be16 proto, u16 vid) __always_unused __be16 proto, u16 vid)
{ {
struct i40e_netdev_priv *np = netdev_priv(netdev); struct i40e_netdev_priv *np = netdev_priv(netdev);
struct i40e_vsi *vsi = np->vsi; struct i40e_vsi *vsi = np->vsi;
int ret; int ret = 0;
if (vid > 4095) if (vid > 4095)
return 0; return -EINVAL;
netdev_info(netdev, "adding %pM vid=%d\n", netdev->dev_addr, vid);
netdev_info(vsi->netdev, "adding %pM vid=%d\n",
netdev->dev_addr, vid);
/* If the network stack called us with vid = 0, we should /* If the network stack called us with vid = 0, we should
* indicate to i40e_vsi_add_vlan() that we want to receive * indicate to i40e_vsi_add_vlan() that we want to receive
* any traffic (i.e. with any vlan tag, or untagged) * any traffic (i.e. with any vlan tag, or untagged)
*/ */
ret = i40e_vsi_add_vlan(vsi, vid ? vid : I40E_VLAN_ANY); ret = i40e_vsi_add_vlan(vsi, vid ? vid : I40E_VLAN_ANY);
if (!ret) { if (!ret && (vid < VLAN_N_VID))
if (vid < VLAN_N_VID) set_bit(vid, vsi->active_vlans);
set_bit(vid, vsi->active_vlans);
}
return 0; return ret;
} }
/** /**
* i40e_vlan_rx_kill_vid - Remove a vlan id filter from HW offload * i40e_vlan_rx_kill_vid - Remove a vlan id filter from HW offload
* @netdev: network interface to be adjusted * @netdev: network interface to be adjusted
* @vid: vlan id to be removed * @vid: vlan id to be removed
*
* net_device_ops implementation for adding vlan ids
**/ **/
static int i40e_vlan_rx_kill_vid(struct net_device *netdev, static int i40e_vlan_rx_kill_vid(struct net_device *netdev,
__always_unused __be16 proto, u16 vid) __always_unused __be16 proto, u16 vid)
@ -1898,15 +1902,16 @@ static int i40e_vlan_rx_kill_vid(struct net_device *netdev,
struct i40e_netdev_priv *np = netdev_priv(netdev); struct i40e_netdev_priv *np = netdev_priv(netdev);
struct i40e_vsi *vsi = np->vsi; struct i40e_vsi *vsi = np->vsi;
netdev_info(vsi->netdev, "removing %pM vid=%d\n", netdev_info(netdev, "removing %pM vid=%d\n", netdev->dev_addr, vid);
netdev->dev_addr, vid);
/* return code is ignored as there is nothing a user /* return code is ignored as there is nothing a user
* can do about failure to remove and a log message was * can do about failure to remove and a log message was
* already printed from another function * already printed from the other function
*/ */
i40e_vsi_kill_vlan(vsi, vid); i40e_vsi_kill_vlan(vsi, vid);
clear_bit(vid, vsi->active_vlans); clear_bit(vid, vsi->active_vlans);
return 0; return 0;
} }
@ -3324,7 +3329,8 @@ static void i40e_pf_unquiesce_all_vsi(struct i40e_pf *pf)
**/ **/
static u8 i40e_dcb_get_num_tc(struct i40e_dcbx_config *dcbcfg) static u8 i40e_dcb_get_num_tc(struct i40e_dcbx_config *dcbcfg)
{ {
int num_tc = 0, i; u8 num_tc = 0;
int i;
/* Scan the ETS Config Priority Table to find /* Scan the ETS Config Priority Table to find
* traffic class enabled for a given priority * traffic class enabled for a given priority
@ -3339,9 +3345,7 @@ static u8 i40e_dcb_get_num_tc(struct i40e_dcbx_config *dcbcfg)
/* Traffic class index starts from zero so /* Traffic class index starts from zero so
* increment to return the actual count * increment to return the actual count
*/ */
num_tc++; return num_tc + 1;
return num_tc;
} }
/** /**
@ -3491,6 +3495,7 @@ static int i40e_vsi_get_bw_info(struct i40e_vsi *vsi)
/* 3 bits out of 4 for each TC */ /* 3 bits out of 4 for each TC */
vsi->bw_ets_max_quanta[i] = (u8)((tc_bw_max >> (i*4)) & 0x7); vsi->bw_ets_max_quanta[i] = (u8)((tc_bw_max >> (i*4)) & 0x7);
} }
return 0; return 0;
} }