Commit 749c6940 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents b8a841a9 244714da

drivers/net/ethernet/intel/ice/ice_devlink.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/net/ethernet/intel/ice/ice_devlink.h

+0 −4
Original line number Diff line number Diff line
@@ -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);