From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Mitch Williams <mitch.a.williams@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Jesse Brandeburg <jesse.brandeburg@intel.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next v2 16/16] i40e: report VF MAC addresses correctly
Date: Fri, 20 Dec 2013 08:46:05 -0800 [thread overview]
Message-ID: <1387557965-13241-17-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1387557965-13241-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Mitch Williams <mitch.a.williams@intel.com>
If the user does not assign a VF MAC address, then just report it as
zero. Attempting to guess the correct primary MAC address of the VF is a
futile and heartbreaking endeavour.
Change-Id: I2673577a160afb6fc55094c890467b44e60c7584
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 1dd13f4..cc4ebf5 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -2005,7 +2005,6 @@ int i40e_ndo_get_vf_config(struct net_device *netdev,
int vf_id, struct ifla_vf_info *ivi)
{
struct i40e_netdev_priv *np = netdev_priv(netdev);
- struct i40e_mac_filter *f, *ftmp;
struct i40e_vsi *vsi = np->vsi;
struct i40e_pf *pf = vsi->back;
struct i40e_vf *vf;
@@ -2029,11 +2028,7 @@ int i40e_ndo_get_vf_config(struct net_device *netdev,
ivi->vf = vf_id;
- /* first entry of the list is the default ethernet address */
- list_for_each_entry_safe(f, ftmp, &vsi->mac_filter_list, list) {
- memcpy(&ivi->mac, f->macaddr, I40E_ETH_LENGTH_OF_ADDRESS);
- break;
- }
+ memcpy(&ivi->mac, vf->default_lan_addr.addr, ETH_ALEN);
ivi->tx_rate = 0;
ivi->vlan = le16_to_cpu(vsi->info.pvid) & I40E_VLAN_MASK;
--
1.8.3.1
prev parent reply other threads:[~2013-12-20 16:48 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-20 16:45 [net-next v2 00/16][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 01/16] i40e: using for_each_set_bit to simplify the code Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 02/16] i40e: Suppress HMC error to Interrupt message level Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 03/16] i40e: Populate and check pci bus speed and width Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 04/16] i40e: add wake-on-lan support Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 05/16] i40e: fix curly brace use and return type Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 06/16] i40e: Implementation of vxlan ndo's Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 07/16] i40e: Rx checksum offload for VXLAN Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 08/16] i40e: move i40e_reset_vf Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 09/16] i40e: refactor VF reset flow Jeff Kirsher
2013-12-20 16:45 ` [net-next v2 10/16] i40e: remove redundant code Jeff Kirsher
2013-12-20 16:46 ` [net-next v2 11/16] i40e: remove chatty log messages Jeff Kirsher
2013-12-20 18:18 ` Sergei Shtylyov
2013-12-20 17:40 ` Williams, Mitch A
2013-12-20 17:59 ` Joe Perches
2013-12-20 18:00 ` Jeff Kirsher
2013-12-20 18:04 ` Williams, Mitch A
2013-12-20 18:31 ` Joe Perches
2013-12-20 18:00 ` Williams, Mitch A
2013-12-20 16:46 ` [net-next v2 12/16] i40e: fix error return Jeff Kirsher
2013-12-20 16:46 ` [net-next v2 13/16] i40e: be more informative Jeff Kirsher
2013-12-20 16:46 ` [net-next v2 14/16] i40e: make a define from a large constant Jeff Kirsher
2013-12-20 16:46 ` [net-next v2 15/16] i40e: update led set args Jeff Kirsher
2013-12-20 16:46 ` Jeff Kirsher [this message]
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=1387557965-13241-17-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=jesse.brandeburg@intel.com \
--cc=mitch.a.williams@intel.com \
--cc=netdev@vger.kernel.org \
--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).