From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jesse Brandeburg <jesse.brandeburg@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 14/16] i40e: remove VF device IDs from PF
Date: Tue, 16 Feb 2016 21:34:20 -0800 [thread overview]
Message-ID: <1455687262-20453-15-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1455687262-20453-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Jesse Brandeburg <jesse.brandeburg@intel.com>
The PF doesn't need to know about the VF's device IDs, so remove them.
Change-ID: I62cf0e0fffa1ace586e58e00bc271b10ae440f05
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Acked-by: Shannon Nelson <shannon.nelson@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_common.c | 8 --------
drivers/net/ethernet/intel/i40e/i40e_devids.h | 4 ----
2 files changed, 12 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index 3b03a31..9018f28 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -62,14 +62,6 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw)
case I40E_DEV_ID_10G_BASE_T_X722:
hw->mac.type = I40E_MAC_X722;
break;
- case I40E_DEV_ID_X722_VF:
- case I40E_DEV_ID_X722_VF_HV:
- hw->mac.type = I40E_MAC_X722_VF;
- break;
- case I40E_DEV_ID_VF:
- case I40E_DEV_ID_VF_HV:
- hw->mac.type = I40E_MAC_VF;
- break;
default:
hw->mac.type = I40E_MAC_GENERIC;
break;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_devids.h b/drivers/net/ethernet/intel/i40e/i40e_devids.h
index f7ce5c7..99257fc 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_devids.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_devids.h
@@ -39,15 +39,11 @@
#define I40E_DEV_ID_20G_KR2 0x1587
#define I40E_DEV_ID_20G_KR2_A 0x1588
#define I40E_DEV_ID_10G_BASE_T4 0x1589
-#define I40E_DEV_ID_VF 0x154C
-#define I40E_DEV_ID_VF_HV 0x1571
#define I40E_DEV_ID_KX_X722 0x37CE
#define I40E_DEV_ID_QSFP_X722 0x37CF
#define I40E_DEV_ID_SFP_X722 0x37D0
#define I40E_DEV_ID_1G_BASE_T_X722 0x37D1
#define I40E_DEV_ID_10G_BASE_T_X722 0x37D2
-#define I40E_DEV_ID_X722_VF 0x37CD
-#define I40E_DEV_ID_X722_VF_HV 0x37D9
#define i40e_is_40G_device(d) ((d) == I40E_DEV_ID_QSFP_A || \
(d) == I40E_DEV_ID_QSFP_B || \
--
2.5.0
next prev parent reply other threads:[~2016-02-17 5:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-17 5:34 [net-next 00/16][pull request] 40GbE Intel Wired LAN Driver Updates 2016-02-16 Jeff Kirsher
2016-02-17 5:34 ` [net-next 01/16] i40e: AQ Shared resource flags Jeff Kirsher
2016-02-17 5:34 ` [net-next 02/16] i40e: AQ Add set_switch_config Jeff Kirsher
2016-02-17 5:34 ` [net-next 03/16] i40e: AQ Add VXLAN-GPE tunnel type Jeff Kirsher
2016-02-17 5:34 ` [net-next 04/16] i40e: AQ thermal sensor control struct Jeff Kirsher
2016-02-17 5:34 ` [net-next 05/16] i40e: Bump AQ minor version to 1.5 for new FW features Jeff Kirsher
2016-02-17 5:34 ` [net-next 06/16] i40e: Store lan_vsi_idx and lan_vsi_id in the right size Jeff Kirsher
2016-02-17 5:34 ` [net-next 07/16] i40e: fix write-back-on-itr to work with legacy itr Jeff Kirsher
2016-02-17 5:34 ` [net-next 08/16] i40e: add counter for arq overflows Jeff Kirsher
2016-02-17 5:34 ` [net-next 09/16] i40e: add 20G speed for Tx bandwidth calculations Jeff Kirsher
2016-02-17 5:34 ` [net-next 10/16] i40e: refactor DCB function Jeff Kirsher
2016-02-17 5:34 ` [net-next 11/16] i40e: add a little more to an NVM update debug message Jeff Kirsher
2016-02-17 5:34 ` [net-next 12/16] i40evf: enable bus master after reset Jeff Kirsher
2016-02-17 5:34 ` [net-next 13/16] i40e: add netdev info to VSI dump Jeff Kirsher
2016-02-17 5:34 ` Jeff Kirsher [this message]
2016-02-17 5:34 ` [net-next 15/16] i40e: trivial: remove unnecessary local var Jeff Kirsher
2016-02-17 5:34 ` [net-next 16/16] i40e/i40evf: Bump i40e to 1.4.11 and i40evf to 1.4.7 Jeff Kirsher
2016-02-17 14:49 ` [net-next 00/16][pull request] 40GbE Intel Wired LAN Driver Updates 2016-02-16 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=1455687262-20453-15-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=jesse.brandeburg@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).