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

Commit 6997d4d1 authored Feb 22, 2014 by Jacob Keller Committed by Jeff Kirsher Mar 12, 2014

ixgbe: move setting rx_pb_size into get_invariants



Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 0e7bcee4

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -104,6 +104,7 @@ static s32 ixgbe_get_invariants_82598(struct ixgbe_hw *hw)
	mac->mcft_size = IXGBE_82598_MC_TBL_SIZE;		mac->mcft_size = IXGBE_82598_MC_TBL_SIZE;
	mac->vft_size = IXGBE_82598_VFT_TBL_SIZE;		mac->vft_size = IXGBE_82598_VFT_TBL_SIZE;
	mac->num_rar_entries = IXGBE_82598_RAR_ENTRIES;		mac->num_rar_entries = IXGBE_82598_RAR_ENTRIES;
			mac->rx_pb_size = IXGBE_82598_RX_PB_SIZE;
	mac->max_rx_queues = IXGBE_82598_MAX_RX_QUEUES;		mac->max_rx_queues = IXGBE_82598_MAX_RX_QUEUES;
	mac->max_tx_queues = IXGBE_82598_MAX_TX_QUEUES;		mac->max_tx_queues = IXGBE_82598_MAX_TX_QUEUES;
	mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw);		mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw);
	@@ -205,8 +206,6 @@ static s32 ixgbe_start_hw_82598(struct ixgbe_hw *hw)
	IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(i), regval);		IXGBE_WRITE_REG(hw, IXGBE_DCA_RXCTRL(i), regval);
	}		}

	hw->mac.rx_pb_size = IXGBE_82598_RX_PB_SIZE;

	/* set the completion timeout for interface */		/* set the completion timeout for interface */
	if (ret_val == 0)		if (ret_val == 0)
	ixgbe_set_pcie_completion_timeout(hw);		ixgbe_set_pcie_completion_timeout(hw);

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -270,6 +270,7 @@ static s32 ixgbe_get_invariants_82599(struct ixgbe_hw *hw)
	mac->mcft_size = IXGBE_82599_MC_TBL_SIZE;		mac->mcft_size = IXGBE_82599_MC_TBL_SIZE;
	mac->vft_size = IXGBE_82599_VFT_TBL_SIZE;		mac->vft_size = IXGBE_82599_VFT_TBL_SIZE;
	mac->num_rar_entries = IXGBE_82599_RAR_ENTRIES;		mac->num_rar_entries = IXGBE_82599_RAR_ENTRIES;
			mac->rx_pb_size = IXGBE_82599_RX_PB_SIZE;
	mac->max_rx_queues = IXGBE_82599_MAX_RX_QUEUES;		mac->max_rx_queues = IXGBE_82599_MAX_RX_QUEUES;
	mac->max_tx_queues = IXGBE_82599_MAX_TX_QUEUES;		mac->max_tx_queues = IXGBE_82599_MAX_TX_QUEUES;
	mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw);		mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw);
	@@ -2025,7 +2026,6 @@ static s32 ixgbe_start_hw_82599(struct ixgbe_hw *hw)

	/* We need to run link autotry after the driver loads */		/* We need to run link autotry after the driver loads */
	hw->mac.autotry_restart = true;		hw->mac.autotry_restart = true;
	hw->mac.rx_pb_size = IXGBE_82599_RX_PB_SIZE;

	if (ret_val == 0)		if (ret_val == 0)
	ret_val = ixgbe_verify_fw_version_82599(hw);		ret_val = ixgbe_verify_fw_version_82599(hw);

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -61,6 +61,7 @@ static s32 ixgbe_get_invariants_X540(struct ixgbe_hw *hw)
	mac->mcft_size = IXGBE_X540_MC_TBL_SIZE;		mac->mcft_size = IXGBE_X540_MC_TBL_SIZE;
	mac->vft_size = IXGBE_X540_VFT_TBL_SIZE;		mac->vft_size = IXGBE_X540_VFT_TBL_SIZE;
	mac->num_rar_entries = IXGBE_X540_RAR_ENTRIES;		mac->num_rar_entries = IXGBE_X540_RAR_ENTRIES;
			mac->rx_pb_size = IXGBE_X540_RX_PB_SIZE;
	mac->max_rx_queues = IXGBE_X540_MAX_RX_QUEUES;		mac->max_rx_queues = IXGBE_X540_MAX_RX_QUEUES;
	mac->max_tx_queues = IXGBE_X540_MAX_TX_QUEUES;		mac->max_tx_queues = IXGBE_X540_MAX_TX_QUEUES;
	mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw);		mac->max_msix_vectors = ixgbe_get_pcie_msix_count_generic(hw);
	@@ -187,7 +188,6 @@ static s32 ixgbe_start_hw_X540(struct ixgbe_hw *hw)
	goto out;		goto out;

	ret_val = ixgbe_start_hw_gen2(hw);		ret_val = ixgbe_start_hw_gen2(hw);
	hw->mac.rx_pb_size = IXGBE_X540_RX_PB_SIZE;
	out:		out:
	return ret_val;		return ret_val;
	}		}