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

Commit 2b88f2de authored by John Fastabend's avatar John Fastabend Committed by Jeff Kirsher
Browse files

net: dcb: getnumtcs()/setnumtcs() should return an int 



{g|s}etnumtcs() today returns a u8 that is only used by the DCB code
to verify no error occurred. Today the driver implementations return
negative error codes which end up being non-zero so the logic works
out but triggers some sparse warnings.

To fix the sparse warnings convert the return value to an int.

CC: Eilon Greenstein <eilong@broadcom.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Tested-by: default avatarRoss Brattain <ross.b.brattain@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 89d27a3c

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

+2 −2
Original line number Diff line number Diff line
@@ -2142,7 +2142,7 @@ static u8 bnx2x_dcbnl_get_cap(struct net_device *netdev, int capid, u8 *cap) 
	return rval;

}



static u8 bnx2x_dcbnl_get_numtcs(struct net_device *netdev, int tcid, u8 *num)

static int bnx2x_dcbnl_get_numtcs(struct net_device *netdev, int tcid, u8 *num)

{

	struct bnx2x *bp = netdev_priv(netdev);

	u8 rval = 0;
@@ -2169,7 +2169,7 @@ static u8 bnx2x_dcbnl_get_numtcs(struct net_device *netdev, int tcid, u8 *num) 
	return rval;

}



static u8 bnx2x_dcbnl_set_numtcs(struct net_device *netdev, int tcid, u8 num)

static int bnx2x_dcbnl_set_numtcs(struct net_device *netdev, int tcid, u8 num)

{

	struct bnx2x *bp = netdev_priv(netdev);

	DP(NETIF_MSG_LINK, "num tcs = %d; Not supported\n", num);

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

+2 −2
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static u8 ixgbe_dcbnl_getcap(struct net_device *netdev, int capid, u8 *cap) 
	return 0;

}



static u8 ixgbe_dcbnl_getnumtcs(struct net_device *netdev, int tcid, u8 *num)

static int ixgbe_dcbnl_getnumtcs(struct net_device *netdev, int tcid, u8 *num)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	u8 rval = 0;
@@ -514,7 +514,7 @@ static u8 ixgbe_dcbnl_getnumtcs(struct net_device *netdev, int tcid, u8 *num) 
	return rval;

}



static u8 ixgbe_dcbnl_setnumtcs(struct net_device *netdev, int tcid, u8 num)

static int ixgbe_dcbnl_setnumtcs(struct net_device *netdev, int tcid, u8 num)

{

	return -EINVAL;

}

include/net/dcbnl.h

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ struct dcbnl_rtnl_ops { 
	void (*getpfccfg)(struct net_device *, int, u8 *);

	u8   (*setall)(struct net_device *);

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

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

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

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

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

	u8   (*getpfcstate)(struct net_device *);

	void (*setpfcstate)(struct net_device *, u8);

	void (*getbcncfg)(struct net_device *, int, u32 *);