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

Commit 25cccecc authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

Fix up sky2 breakage 



	Doing |= 1 << 19 to 16bit unsigned is not particulary useful;
that register is 32bit, unlike the ones dealt with in the rest of
function, so we need u32 variable here.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a9204879

drivers/net/sky2.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -692,6 +692,7 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port) 
{

{

	struct sky2_port *sky2 = netdev_priv(hw->dev[port]);

	struct sky2_port *sky2 = netdev_priv(hw->dev[port]);

	u16 reg;

	u16 reg;

	u32 rx_reg;

	int i;

	int i;

	const u8 *addr = hw->dev[port]->dev_addr;

	const u8 *addr = hw->dev[port]->dev_addr;
@@ -768,11 +769,11 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port) 




	/* Configure Rx MAC FIFO */

	/* Configure Rx MAC FIFO */

	sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_CLR);

	sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_CLR);

	reg = GMF_OPER_ON | GMF_RX_F_FL_ON;

	rx_reg = GMF_OPER_ON | GMF_RX_F_FL_ON;

	if (hw->chip_id == CHIP_ID_YUKON_EX)

	if (hw->chip_id == CHIP_ID_YUKON_EX)

		reg |= GMF_RX_OVER_ON;

		rx_reg |= GMF_RX_OVER_ON;





	sky2_write32(hw, SK_REG(port, RX_GMF_CTRL_T), reg);

	sky2_write32(hw, SK_REG(port, RX_GMF_CTRL_T), rx_reg);





	/* Flush Rx MAC FIFO on any flow control or error */

	/* Flush Rx MAC FIFO on any flow control or error */

	sky2_write16(hw, SK_REG(port, RX_GMF_FL_MSK), GMR_FS_ANY_ERR);

	sky2_write16(hw, SK_REG(port, RX_GMF_FL_MSK), GMR_FS_ANY_ERR);