Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2659479 authored by Anish Bhatt's avatar Anish Bhatt Committed by David S. Miller
Browse files

Update setapp/getapp prototypes in dcbnl_rtnl_ops to return int instead of u8 



v2: fixed issue with checking return of dcbnl_rtnl_ops->getapp()

Signed-off-by: default avatarAnish Bhatt <anish@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9cc63db5

drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c

+2 −2
Original line number Diff line number Diff line
@@ -2303,7 +2303,7 @@ static int bnx2x_set_admin_app_up(struct bnx2x *bp, u8 idtype, u16 idval, u8 up) 
	return 0;

}



static u8 bnx2x_dcbnl_set_app_up(struct net_device *netdev, u8 idtype,

static int bnx2x_dcbnl_set_app_up(struct net_device *netdev, u8 idtype,

				  u16 idval, u8 up)

{

	struct bnx2x *bp = netdev_priv(netdev);

drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c

+6 −15
Original line number Diff line number Diff line
@@ -648,25 +648,16 @@ static int __cxgb4_getapp(struct net_device *dev, u8 app_idtype, u16 app_id, 
}



/* Return the Application User Priority Map associated with the specified

 * Application ID.  Since this routine is prototyped to return "u8" we can't

 * return errors ...

 * Application ID.

 */

static u8 cxgb4_getapp(struct net_device *dev, u8 app_idtype, u16 app_id)

static int cxgb4_getapp(struct net_device *dev, u8 app_idtype, u16 app_id)

{

	int result = __cxgb4_getapp(dev, app_idtype, app_id, 0);



	if (result < 0)

		result = 0;



	return result;

	return __cxgb4_getapp(dev, app_idtype, app_id, 0);

}



/* Write a new Application User Priority Map for the specified Application ID.

 * This routine is prototyped to return "u8" but other instantiations of the

 * DCB NetLink Operations "setapp" routines return negative errnos for errors.

 * We follow their lead.

/* Write a new Application User Priority Map for the specified Application ID

 */

static u8 cxgb4_setapp(struct net_device *dev, u8 app_idtype, u16 app_id,

static int cxgb4_setapp(struct net_device *dev, u8 app_idtype, u16 app_id,

			u8 app_prio)

{

	struct fw_port_cmd pcmd;

drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c

+3 −3
Original line number Diff line number Diff line
@@ -495,10 +495,10 @@ static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state) 
 * @id: id is either ether type or TCP/UDP port number

 *

 * Returns : on success, returns a non-zero 802.1p user priority bitmap

 * otherwise returns 0 as the invalid user priority bitmap to indicate an

 * otherwise returns -EINVAL as the invalid user priority bitmap to indicate an

 * error.

 */

static u8 ixgbe_dcbnl_getapp(struct net_device *netdev, u8 idtype, u16 id)

static int ixgbe_dcbnl_getapp(struct net_device *netdev, u8 idtype, u16 id)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct dcb_app app = {
@@ -507,7 +507,7 @@ static u8 ixgbe_dcbnl_getapp(struct net_device *netdev, u8 idtype, u16 id) 
			     };



	if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE))

		return 0;

		return -EINVAL;



	return dcb_getapp(netdev, &app);

}

drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c

+2 −2
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ static int qlcnic_dcb_get_num_tcs(struct net_device *netdev, int attr, u8 *num) 
	}

}



static u8 qlcnic_dcb_get_app(struct net_device *netdev, u8 idtype, u16 id)

static int qlcnic_dcb_get_app(struct net_device *netdev, u8 idtype, u16 id)

{

	struct qlcnic_adapter *adapter = netdev_priv(netdev);

	struct dcb_app app = {
@@ -935,7 +935,7 @@ static u8 qlcnic_dcb_get_app(struct net_device *netdev, u8 idtype, u16 id) 
			     };



	if (!test_bit(QLCNIC_DCB_STATE, &adapter->dcb->state))

		return 0;

		return -EINVAL;



	return dcb_getapp(netdev, &app);

}

include/net/dcbnl.h

+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ struct dcbnl_rtnl_ops { 
	void (*setbcncfg)(struct net_device *, int, u32);

	void (*getbcnrp)(struct net_device *, int, u8 *);

	void (*setbcnrp)(struct net_device *, int, u8);

	u8   (*setapp)(struct net_device *, u8, u16, u8);

	u8   (*getapp)(struct net_device *, u8, u16);

	int  (*setapp)(struct net_device *, u8, u16, u8);

	int  (*getapp)(struct net_device *, u8, u16);

	u8   (*getfeatcfg)(struct net_device *, int, u8 *);

	u8   (*setfeatcfg)(struct net_device *, int, u8);