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

Commit 738de00c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ethtool-fix-use-of-SPEED_UNKNOWN-constant' 



Michael Zhivich says:

====================
ethtool: fix use of SPEED_UNKNOWN constant

This patch series addresses 2 related issues:

1. ethtool_validate_speed() triggers a "signed-unsigned comparison"
warning due to type difference of SPEED_UNKNOWN constant (int)
and argument to ethtool_validate_speed (__u32).

2. some drivers use u16 storage for SPEED_UNKNOWN constant,
resulting in value truncation and thus failure to test against
SPEED_UNKNOWN correctly.

This revised series addresses several feedback comments:
- split up the patch in to series
- do not unnecessarily change drivers that use "int" storage
  for speed values
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3c5189ad d63da85a

drivers/net/ethernet/broadcom/tg3.c

+4 −4
Original line number Diff line number Diff line
@@ -4283,7 +4283,7 @@ static void tg3_power_down(struct tg3 *tp) 
	pci_set_power_state(tp->pdev, PCI_D3hot);

}



static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u16 *speed, u8 *duplex)

static void tg3_aux_stat_to_speed_duplex(struct tg3 *tp, u32 val, u32 *speed, u8 *duplex)

{

	switch (val & MII_TG3_AUX_STAT_SPDMASK) {

	case MII_TG3_AUX_STAT_10HALF:
@@ -4787,7 +4787,7 @@ static int tg3_setup_copper_phy(struct tg3 *tp, bool force_reset) 
	bool current_link_up;

	u32 bmsr, val;

	u32 lcl_adv, rmt_adv;

	u16 current_speed;

	u32 current_speed;

	u8 current_duplex;

	int i, err;
@@ -5719,7 +5719,7 @@ static bool tg3_setup_fiber_by_hand(struct tg3 *tp, u32 mac_status) 
static int tg3_setup_fiber_phy(struct tg3 *tp, bool force_reset)

{

	u32 orig_pause_cfg;

	u16 orig_active_speed;

	u32 orig_active_speed;

	u8 orig_active_duplex;

	u32 mac_status;

	bool current_link_up;
@@ -5823,7 +5823,7 @@ static int tg3_setup_fiber_mii_phy(struct tg3 *tp, bool force_reset) 
{

	int err = 0;

	u32 bmsr, bmcr;

	u16 current_speed = SPEED_UNKNOWN;

	u32 current_speed = SPEED_UNKNOWN;

	u8 current_duplex = DUPLEX_UNKNOWN;

	bool current_link_up = false;

	u32 local_adv, remote_adv, sgsr;

drivers/net/ethernet/broadcom/tg3.h

+2 −2
Original line number Diff line number Diff line
@@ -2873,7 +2873,7 @@ struct tg3_tx_ring_info { 
struct tg3_link_config {

	/* Describes what we're trying to get. */

	u32				advertising;

	u16				speed;

	u32				speed;

	u8				duplex;

	u8				autoneg;

	u8				flowctrl;
@@ -2882,7 +2882,7 @@ struct tg3_link_config { 
	u8				active_flowctrl;



	u8				active_duplex;

	u16				active_speed;

	u32				active_speed;

	u32				rmt_adv;

};

drivers/net/ethernet/qlogic/qlcnic/qlcnic.h

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ struct qlcnic_hardware_context { 
	u16 board_type;

	u16 supported_type;



	u16 link_speed;

	u32 link_speed;

	u16 link_duplex;

	u16 link_autoneg;

	u16 module_type;

include/uapi/linux/ethtool.h

+1 −1
Original line number Diff line number Diff line
@@ -1591,7 +1591,7 @@ enum ethtool_link_mode_bit_indices { 


static inline int ethtool_validate_speed(__u32 speed)

{

	return speed <= INT_MAX || speed == SPEED_UNKNOWN;

	return speed <= INT_MAX || speed == (__u32)SPEED_UNKNOWN;

}



/* Duplex, half or full. */