From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jacob Keller <jacob.e.keller@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 03/15] fm10k: fix incorrect index calculation in fm10k_write_reta
Date: Wed, 29 Jun 2016 14:32:50 -0700 [thread overview]
Message-ID: <1467235982-55437-4-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1467235982-55437-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Jacob Keller <jacob.e.keller@intel.com>
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 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
index 9c0d875..9b51954 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
@@ -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;
}
--
2.5.5
next prev parent reply other threads:[~2016-06-29 21:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-29 21:32 [net-next 00/15][pull request] Intel Wired LAN Driver Updates 2016-06-29 Jeff Kirsher
2016-06-29 21:32 ` [net-next 01/15] fm10k: don't use BIT() macro where the value isn't a bitmask Jeff Kirsher
2016-06-29 21:32 ` [net-next 02/15] fm10k: Align Rx buffers to 512B blocks Jeff Kirsher
2016-06-29 21:32 ` Jeff Kirsher [this message]
2016-06-29 21:32 ` [net-next 04/15] e1000e: prevent division by zero if TIMINCA is zero Jeff Kirsher
2016-06-29 21:32 ` [net-next 05/15] ixgbe: Fix deleting link filters for cls_u32 offloads Jeff Kirsher
2016-06-29 21:32 ` [net-next 06/15] ixgbe: Error handler for duplicate filter locations in hardware " Jeff Kirsher
2016-06-29 21:32 ` [net-next 07/15] igb: introduce ptp_flags variable and use it to replace IGB_FLAG_PTP Jeff Kirsher
2016-06-29 21:32 ` [net-next 08/15] igb: introduce IGB_PTP_OVERFLOW_CHECK flag Jeff Kirsher
2016-06-29 21:32 ` [net-next 09/15] igb: re-use igb_ptp_reset in igb_ptp_init Jeff Kirsher
2016-06-29 21:32 ` [net-next 10/15] igb: implement igb_ptp_suspend Jeff Kirsher
2016-06-29 21:32 ` [net-next 11/15] igb: call igb_ptp_suspend during suspend/resume cycle Jeff Kirsher
2016-06-29 21:32 ` [net-next 12/15] fm10k: Remove create_workqueue Jeff Kirsher
2016-06-29 21:33 ` [net-next 13/15] ixgbe: Correct reporting of timestamping for x550 Jeff Kirsher
2016-06-29 21:33 ` [net-next 14/15] ixgbe: fix spoofed packets with macvlans Jeff Kirsher
2016-06-29 21:33 ` [net-next 15/15] igb: Only DMA sync frame length Jeff Kirsher
2016-06-30 13:29 ` [net-next 00/15][pull request] Intel Wired LAN Driver Updates 2016-06-29 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467235982-55437-4-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=jacob.e.keller@intel.com \
--cc=jogreene@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).