ixgbe: DCB remove ixgbe_fcoe_getapp routine
Remove ixgbe_fcoe_getapp() and use the generic kernel routine instead. Also add application priority to the kernel maintained list on setapp so applications and stacks can query the value. Signed-off-by: John Fastabend <john.r.fastabend@intel.com> Tested-by: Ross Brattain <ross.b.brattain@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
parent
f8628d4045
commit
dc166e22ed
2 changed files with 13 additions and 30 deletions
|
@ -542,24 +542,15 @@ static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state)
|
|||
static u8 ixgbe_dcbnl_getapp(struct net_device *netdev, u8 idtype, u16 id)
|
||||
{
|
||||
struct ixgbe_adapter *adapter = netdev_priv(netdev);
|
||||
u8 rval = 0;
|
||||
struct dcb_app app = {
|
||||
.selector = idtype,
|
||||
.protocol = id,
|
||||
};
|
||||
|
||||
if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE))
|
||||
return rval;
|
||||
return 0;
|
||||
|
||||
switch (idtype) {
|
||||
case DCB_APP_IDTYPE_ETHTYPE:
|
||||
#ifdef IXGBE_FCOE
|
||||
if (id == ETH_P_FCOE)
|
||||
rval = ixgbe_fcoe_getapp(adapter);
|
||||
#endif
|
||||
break;
|
||||
case DCB_APP_IDTYPE_PORTNUM:
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return rval;
|
||||
return dcb_getapp(netdev, &app);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -576,10 +567,17 @@ static u8 ixgbe_dcbnl_setapp(struct net_device *netdev,
|
|||
{
|
||||
struct ixgbe_adapter *adapter = netdev_priv(netdev);
|
||||
u8 rval = 1;
|
||||
struct dcb_app app = {
|
||||
.selector = idtype,
|
||||
.protocol = id,
|
||||
.priority = up
|
||||
};
|
||||
|
||||
if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE))
|
||||
return rval;
|
||||
|
||||
rval = dcb_setapp(netdev, &app);
|
||||
|
||||
switch (idtype) {
|
||||
case DCB_APP_IDTYPE_ETHTYPE:
|
||||
#ifdef IXGBE_FCOE
|
||||
|
|
|
@ -812,21 +812,6 @@ out_disable:
|
|||
}
|
||||
|
||||
#ifdef CONFIG_IXGBE_DCB
|
||||
/**
|
||||
* ixgbe_fcoe_getapp - retrieves current user priority bitmap for FCoE
|
||||
* @adapter : ixgbe adapter
|
||||
*
|
||||
* Finds out the corresponding user priority bitmap from the current
|
||||
* traffic class that FCoE belongs to. Returns 0 as the invalid user
|
||||
* priority bitmap to indicate an error.
|
||||
*
|
||||
* Returns : 802.1p user priority bitmap for FCoE
|
||||
*/
|
||||
u8 ixgbe_fcoe_getapp(struct ixgbe_adapter *adapter)
|
||||
{
|
||||
return 1 << adapter->fcoe.up;
|
||||
}
|
||||
|
||||
/**
|
||||
* ixgbe_fcoe_setapp - sets the user priority bitmap for FCoE
|
||||
* @adapter : ixgbe adapter
|
||||
|
|
Reference in a new issue