diff options
| author | David S. Miller <davem@davemloft.net> | 2021-12-01 14:42:23 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-12-01 14:42:23 +0000 |
| commit | 749c69400a4584484a3e09e6c27e3de331e94693 (patch) | |
| tree | 1f498ce2ac2909caf08a7a879667535c33669e1f /drivers/net | |
| parent | b8a841a9da74283537dad6ab8d938da26aeb0656 (diff) | |
| parent | 244714da8d5d088faa2e0e32ba84ca1913a093ef (diff) | |
| download | linux-749c69400a4584484a3e09e6c27e3de331e94693.tar.bz2 | |
Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue
Tony Nguyen says:
====================
100GbE Intel Wired LAN Driver Updates 2021-11-30
This series contains updates to ice driver only.
Shiraz corrects assignment of boolean variable and removes an unused
enum.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_devlink.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice_devlink.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.c b/drivers/net/ethernet/intel/ice/ice_devlink.c index 478412b28a76..1cfe918db8b9 100644 --- a/drivers/net/ethernet/intel/ice/ice_devlink.c +++ b/drivers/net/ethernet/intel/ice/ice_devlink.c @@ -436,7 +436,7 @@ ice_devlink_enable_roce_get(struct devlink *devlink, u32 id, { struct ice_pf *pf = devlink_priv(devlink); - ctx->val.vbool = pf->rdma_mode & IIDC_RDMA_PROTOCOL_ROCEV2; + ctx->val.vbool = pf->rdma_mode & IIDC_RDMA_PROTOCOL_ROCEV2 ? true : false; return 0; } diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.h b/drivers/net/ethernet/intel/ice/ice_devlink.h index faea757fcf5d..fe006d9946f8 100644 --- a/drivers/net/ethernet/intel/ice/ice_devlink.h +++ b/drivers/net/ethernet/intel/ice/ice_devlink.h @@ -4,10 +4,6 @@ #ifndef _ICE_DEVLINK_H_ #define _ICE_DEVLINK_H_ -enum ice_devlink_param_id { - ICE_DEVLINK_PARAM_ID_BASE = DEVLINK_PARAM_GENERIC_ID_MAX, -}; - struct ice_pf *ice_allocate_pf(struct device *dev); void ice_devlink_register(struct ice_pf *pf); |