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

Commit b85c94b6 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

i40e/i40evf: remove mismatched type warnings 



Compiler reported several places where driver compared
signed and unsigned types.  Cast or change the types to remove
the warnings.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 601a2e7a

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+3 −3
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ static void i40e_get_regs(struct net_device *netdev, struct ethtool_regs *regs, 
	struct i40e_pf *pf = np->vsi->back;

	struct i40e_hw *hw = &pf->hw;

	u32 *reg_buf = p;

	int i, j, ri;

	unsigned int i, j, ri;

	u32 reg;



	/* Tell ethtool which driver-version-specific regs output we have.
@@ -1550,9 +1550,9 @@ static void i40e_get_ethtool_stats(struct net_device *netdev, 
	struct i40e_ring *tx_ring, *rx_ring;

	struct i40e_vsi *vsi = np->vsi;

	struct i40e_pf *pf = vsi->back;

	unsigned int j;

	int i = 0;

	char *p;

	int j;

	struct rtnl_link_stats64 *net_stats = i40e_get_vsi_stats_struct(vsi);

	unsigned int start;
@@ -1637,7 +1637,7 @@ static void i40e_get_strings(struct net_device *netdev, u32 stringset, 
	struct i40e_vsi *vsi = np->vsi;

	struct i40e_pf *pf = vsi->back;

	char *p = (char *)data;

	int i;

	unsigned int i;



	switch (stringset) {

	case ETH_SS_TEST:

drivers/net/ethernet/intel/i40e/i40e_main.c

+1 −1
Original line number Diff line number Diff line
@@ -4773,7 +4773,7 @@ static void i40e_detect_recover_hung(struct i40e_pf *pf) 
{

	struct net_device *netdev;

	struct i40e_vsi *vsi;

	int i;

	unsigned int i;



	/* Only for LAN VSI */

	vsi = pf->vsi[pf->lan_vsi];

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+3 −3
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ static bool i40e_clean_tx_irq(struct i40e_vsi *vsi, 
	netdev_tx_completed_queue(txring_txq(tx_ring),

				  total_packets, total_bytes);



#define TX_WAKE_THRESHOLD (DESC_NEEDED * 2)

#define TX_WAKE_THRESHOLD ((s16)(DESC_NEEDED * 2))

	if (unlikely(total_packets && netif_carrier_ok(tx_ring->netdev) &&

		     (I40E_DESC_UNUSED(tx_ring) >= TX_WAKE_THRESHOLD))) {

		/* Make sure that anybody stopping the queue after this
@@ -2063,7 +2063,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget) 
	u16 cleaned_count = I40E_DESC_UNUSED(rx_ring);

	bool failure = false, xdp_xmit = false;



	while (likely(total_rx_packets < budget)) {

	while (likely(total_rx_packets < (unsigned int)budget)) {

		struct i40e_rx_buffer *rx_buffer;

		union i40e_rx_desc *rx_desc;

		struct xdp_buff xdp;
@@ -2196,7 +2196,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget) 
	rx_ring->q_vector->rx.total_bytes += total_rx_bytes;



	/* guarantee a trip back through this routine if there was a failure */

	return failure ? budget : total_rx_packets;

	return failure ? budget : (int)total_rx_packets;

}



static u32 i40e_buildreg_itr(const int type, const u16 itr)

drivers/net/ethernet/intel/i40evf/i40e_txrx.c

+3 −3
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static bool i40e_clean_tx_irq(struct i40e_vsi *vsi, 
	netdev_tx_completed_queue(txring_txq(tx_ring),

				  total_packets, total_bytes);



#define TX_WAKE_THRESHOLD (DESC_NEEDED * 2)

#define TX_WAKE_THRESHOLD ((s16)(DESC_NEEDED * 2))

	if (unlikely(total_packets && netif_carrier_ok(tx_ring->netdev) &&

		     (I40E_DESC_UNUSED(tx_ring) >= TX_WAKE_THRESHOLD))) {

		/* Make sure that anybody stopping the queue after this
@@ -1299,7 +1299,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget) 
	u16 cleaned_count = I40E_DESC_UNUSED(rx_ring);

	bool failure = false;



	while (likely(total_rx_packets < budget)) {

	while (likely(total_rx_packets < (unsigned int)budget)) {

		struct i40e_rx_buffer *rx_buffer;

		union i40e_rx_desc *rx_desc;

		unsigned int size;
@@ -1406,7 +1406,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget) 
	rx_ring->q_vector->rx.total_bytes += total_rx_bytes;



	/* guarantee a trip back through this routine if there was a failure */

	return failure ? budget : total_rx_packets;

	return failure ? budget : (int)total_rx_packets;

}



static u32 i40e_buildreg_itr(const int type, const u16 itr)

drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static void i40evf_get_ethtool_stats(struct net_device *netdev, 
				     struct ethtool_stats *stats, u64 *data)

{

	struct i40evf_adapter *adapter = netdev_priv(netdev);

	int i, j;

	unsigned int i, j;

	char *p;



	for (i = 0; i < I40EVF_GLOBAL_STATS_LEN; i++) {
@@ -197,7 +197,7 @@ static void i40evf_get_strings(struct net_device *netdev, u32 sset, u8 *data) 
	int i;



	if (sset == ETH_SS_STATS) {

		for (i = 0; i < I40EVF_GLOBAL_STATS_LEN; i++) {

		for (i = 0; i < (int)I40EVF_GLOBAL_STATS_LEN; i++) {

			memcpy(p, i40evf_gstrings_stats[i].stat_string,

			       ETH_GSTRING_LEN);

			p += ETH_GSTRING_LEN;