]> git.karo-electronics.de Git - linux-beck.git/commitdiff
fm10k: fix incorrect index calculation in fm10k_write_reta
authorJacob Keller <jacob.e.keller@intel.com>
Mon, 18 Apr 2016 22:45:00 +0000 (15:45 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 29 Jun 2016 16:53:36 +0000 (09:53 -0700)
The index calculated when looping through the indir array passed to
fm10k_write_reta was incorrectly calculated as the first part i needs to
be multiplied by 4.

Fixes: 0cfea7a65738 ("fm10k: fix possible null pointer deref after kcalloc", 2016-04-13)
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c

index 9c0d87503977fa577b457ac48981a489527f2f72..9b5195435c87340dff4ef6fc3b346853e42c11af 100644 (file)
@@ -983,9 +983,10 @@ void fm10k_write_reta(struct fm10k_intfc *interface, const u32 *indir)
                /* generate a new table if we weren't given one */
                for (j = 0; j < 4; j++) {
                        if (indir)
-                               n = indir[i + j];
+                               n = indir[4 * i + j];
                        else
-                               n = ethtool_rxfh_indir_default(i + j, rss_i);
+                               n = ethtool_rxfh_indir_default(4 * i + j,
+                                                              rss_i);
 
                        table[j] = n;
                }