diff mbox series

[net,v1] igb: Fix position of assignment to *ring

Message ID 20210611224217.94872-1-jedrzej.jagielski@intel.com
State Under Review
Delegated to: Anthony Nguyen
Headers show
Series [net,v1] igb: Fix position of assignment to *ring | expand

Commit Message

Jędrzej Jagielski June 11, 2021, 10:42 p.m. UTC
Assignment to *ring should be done after correctness check of the
argument queue.

Fixes: 91db364236c8 ("igb: Refactor igb_configure_cbs()")
Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com>
---
 drivers/net/ethernet/intel/igb/igb_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Vinicius Costa Gomes June 10, 2021, 6:07 p.m. UTC | #1
Hi,

Jędrzej Jagielski <jedrzej.jagielski@intel.com> writes:

> Assignment to *ring should be done after correctness check of the
> argument queue.
>
> Fixes: 91db364236c8 ("igb: Refactor igb_configure_cbs()")
> Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com>
> ---

Acked-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
diff mbox series

Patch

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index e6fa1e3c8..e49b2bda1 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -1683,14 +1683,15 @@  static bool is_any_txtime_enabled(struct igb_adapter *adapter)
  **/
 static void igb_config_tx_modes(struct igb_adapter *adapter, int queue)
 {
-	struct igb_ring *ring = adapter->tx_ring[queue];
 	struct net_device *netdev = adapter->netdev;
 	struct e1000_hw *hw = &adapter->hw;
+	struct igb_ring *ring;
 	u32 tqavcc, tqavctrl;
 	u16 value;
 
 	WARN_ON(hw->mac.type != e1000_i210);
 	WARN_ON(queue < 0 || queue > 1);
+	ring = adapter->tx_ring[queue];
 
 	/* If any of the Qav features is enabled, configure queues as SR and
 	 * with HIGH PRIO. If none is, then configure them with LOW PRIO and