diff options
-rw-r--r-- | drivers/net/sky2.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index a2f32151559e..13f08a390e1f 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -692,6 +692,7 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port) | |||
692 | { | 692 | { |
693 | struct sky2_port *sky2 = netdev_priv(hw->dev[port]); | 693 | struct sky2_port *sky2 = netdev_priv(hw->dev[port]); |
694 | u16 reg; | 694 | u16 reg; |
695 | u32 rx_reg; | ||
695 | int i; | 696 | int i; |
696 | const u8 *addr = hw->dev[port]->dev_addr; | 697 | const u8 *addr = hw->dev[port]->dev_addr; |
697 | 698 | ||
@@ -768,11 +769,11 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port) | |||
768 | 769 | ||
769 | /* Configure Rx MAC FIFO */ | 770 | /* Configure Rx MAC FIFO */ |
770 | sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_CLR); | 771 | sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_CLR); |
771 | reg = GMF_OPER_ON | GMF_RX_F_FL_ON; | 772 | rx_reg = GMF_OPER_ON | GMF_RX_F_FL_ON; |
772 | if (hw->chip_id == CHIP_ID_YUKON_EX) | 773 | if (hw->chip_id == CHIP_ID_YUKON_EX) |
773 | reg |= GMF_RX_OVER_ON; | 774 | rx_reg |= GMF_RX_OVER_ON; |
774 | 775 | ||
775 | sky2_write32(hw, SK_REG(port, RX_GMF_CTRL_T), reg); | 776 | sky2_write32(hw, SK_REG(port, RX_GMF_CTRL_T), rx_reg); |
776 | 777 | ||
777 | /* Flush Rx MAC FIFO on any flow control or error */ | 778 | /* Flush Rx MAC FIFO on any flow control or error */ |
778 | sky2_write16(hw, SK_REG(port, RX_GMF_FL_MSK), GMR_FS_ANY_ERR); | 779 | sky2_write16(hw, SK_REG(port, RX_GMF_FL_MSK), GMR_FS_ANY_ERR); |