[Intel-wired-lan] [PATCH net v1] igb: Fix position of assignment to *ring

[Intel-wired-lan] [PATCH net v1] igb: Fix position of assignment to *ring

[Vinicius Costa Gomes]

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>


-- 
Vinicius

[Intel-wired-lan] [PATCH net v1] igb: Fix position of assignment to *ring

[=?unknown-8bit?q?J=C4=99drzej?= Jagielski]

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(-)

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
-- 
2.27.0

[Intel-wired-lan] [PATCH net v1] igb: Fix position of assignment to *ring

[Brelinski, TonyX]

> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of
> Jedrzej Jagielski
> Sent: Friday, June 11, 2021 3:42 PM
> To: intel-wired-lan at lists.osuosl.org
> Cc: Jagielski, Jedrzej <jedrzej.jagielski@intel.com>
> Subject: [Intel-wired-lan] [PATCH net v1] igb: Fix position of assignment to
> *ring
> 
> 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(-)

Tested-by: Tony Brelinski <tonyx.brelinski@intel.com> (A Contingent Worker at Intel)