fm10k: fix mis-ordered parameters in declaration for .ndo_set_vf_bw
Subsystems (2)
PATCH 1/1 fm10k: fix mis-ordered parameters in declaration for .ndo_set_vf_bw
We've had support for setting both a minimum and maximum bandwidth via .ndo_set_vf_bw since commit 883a9ccbae56 ("fm10k: Add support for SR-IOV to driver", 2014-09-20).
Likely because we do not support minimum rates, the declaration mis-ordered the "unused" parameter, which causes warnings when analyzed with cppcheck.
Fix this warning by properly declaring the min_rate and max_rate variables in the declaration and definition (rather than using "unused"). Also rename "rate" to max_rate so as to clarify that we only support setting the maximum rate.
--- drivers/net/ethernet/intel/fm10k/fm10k.h | 4 ++-- drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/fm10k/fm10k.h +2 -2
@@ -562,8 +562,8 @@ s32 fm10k_iov_update_pvid(struct fm10k_intfc *interface, u16 glort, u16 pvid);int fm10k_ndo_set_vf_mac (struct net_device *netdev,int vf_idx,u8 *mac);int fm10k_ndo_set_vf_vlan (struct net_device *netdev,int vf_idx,u16 vid,u8 qos,__be16 vlan_proto); -int fm10k_ndo_set_vf_bw (struct net_device *netdev,int vf_idx,int rate, -int unused); +int fm10k_ndo_set_vf_bw (struct net_device *netdev,int vf_idx, +int __always_unused min_rate,int max_rate);int fm10k_ndo_get_vf_config (struct net_device *netdev,int vf_idx,struct ifla_vf_info *ivi);
drivers/net/ethernet/intel/fm10k/fm10k_iov.c +5 -4
@@ -613,7 +613,7 @@ int fm10k_ndo_set_vf_vlan(struct net_device *netdev, int vf_idx, u16 vid, }int fm10k_ndo_set_vf_bw (struct net_device *netdev,int vf_idx, -int __always_unused unused,int rate) +int __always_unused min_rate,int max_rate) {struct fm10k_intfc *interface =netdev_priv (netdev);struct fm10k_iov_data *iov_data = interface->iov_data;
@@ -624,14 +624,15 @@ int fm10k_ndo_set_vf_bw(struct net_device *netdev, int vf_idx,return -EINVAL ;/* rate limit cannot be less than 10Mbs or greater than link speed */ -if (rate && ((rate <FM10K_VF_TC_MIN ) || rate >FM10K_VF_TC_MAX )) +if (max_rate && + ((max_rate <FM10K_VF_TC_MIN ) || max_rate >FM10K_VF_TC_MAX ))return -EINVAL ;/* store values */ - iov_data->vf_info[vf_idx].rate = rate; + iov_data->vf_info[vf_idx].rate = max_rate;/* update hardware configuration */ - hw->iov.ops.configure_tc (hw, vf_idx, rate); + hw->iov.ops.configure_tc (hw, vf_idx, max_rate);return 0 ; }
Signature · 1 line
2.14.0.rc1.251.g593d8d6362ce
Singh
PATCH 1/1 fm10k: fix mis-ordered parameters in declaration for .ndo_set_vf_bw
Quoted 18 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Jacob Keller
Sent: Friday, August 11, 2017 11:15 AM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH] fm10k: fix mis-ordered parameters in declaration for .ndo_set_vf_bwWe've had support for setting both a minimum and maximum bandwidth via .ndo_set_vf_bw since commit
883a9ccbae56("fm10k: Add support for SR-IOV to driver", 2014-09-20).Likely because we do not support minimum rates, the declaration mis-ordered the "unused" parameter, which causes warnings when analyzed with cppcheck.
Quoted 7 lines
Fix this warning by properly declaring the
min_rateandmax_ratevariables in the declaration and definition (rather than using "unused"). Also rename "rate" tomax_rateso as to clarify that we only support setting the maximum rate.Signed-off-by Jacob Keller <[email protected]>---