From 919ace9b5361843f1dab2524cc344e8d049e8d8b Mon Sep 17 00:00:00 2001
From: "Williams, Mitch A" <mitch.a.williams@intel.com>
Date: Thu, 9 Dec 2010 03:23:56 +0000
Subject: [PATCH] --- yaml --- r: 225396 b: refs/heads/master c:
 031d7952ee63e1aa679f7e87700e3281f4de4ba2 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/igbvf/igbvf.h  | 1 +
 trunk/drivers/net/igbvf/netdev.c | 9 +++++++++
 trunk/drivers/net/igbvf/vf.h     | 2 ++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7b8fd27f52c1..7094b193e62a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e512bfc2c0cd6072387092f8d1ac8e1a758965b
+refs/heads/master: 031d7952ee63e1aa679f7e87700e3281f4de4ba2
diff --git a/trunk/drivers/net/igbvf/igbvf.h b/trunk/drivers/net/igbvf/igbvf.h
index 9d4d63e536d4..990c329e6c3b 100644
--- a/trunk/drivers/net/igbvf/igbvf.h
+++ b/trunk/drivers/net/igbvf/igbvf.h
@@ -97,6 +97,7 @@ struct igbvf_adapter;
 
 enum igbvf_boards {
 	board_vf,
+	board_i350_vf,
 };
 
 struct igbvf_queue_stats {
diff --git a/trunk/drivers/net/igbvf/netdev.c b/trunk/drivers/net/igbvf/netdev.c
index 4fb023bce785..6352c8158e6d 100644
--- a/trunk/drivers/net/igbvf/netdev.c
+++ b/trunk/drivers/net/igbvf/netdev.c
@@ -64,8 +64,16 @@ static struct igbvf_info igbvf_vf_info = {
 	.init_ops               = e1000_init_function_pointers_vf,
 };
 
+static struct igbvf_info igbvf_i350_vf_info = {
+	.mac			= e1000_vfadapt_i350,
+	.flags			= 0,
+	.pba			= 10,
+	.init_ops		= e1000_init_function_pointers_vf,
+};
+
 static const struct igbvf_info *igbvf_info_tbl[] = {
 	[board_vf]              = &igbvf_vf_info,
+	[board_i350_vf]		= &igbvf_i350_vf_info,
 };
 
 /**
@@ -2865,6 +2873,7 @@ static struct pci_error_handlers igbvf_err_handler = {
 
 static DEFINE_PCI_DEVICE_TABLE(igbvf_pci_tbl) = {
 	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_VF), board_vf },
+	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_I350_VF), board_i350_vf },
 	{ } /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, igbvf_pci_tbl);
diff --git a/trunk/drivers/net/igbvf/vf.h b/trunk/drivers/net/igbvf/vf.h
index c36ea21f17fa..d7ed58fcd9bb 100644
--- a/trunk/drivers/net/igbvf/vf.h
+++ b/trunk/drivers/net/igbvf/vf.h
@@ -39,6 +39,7 @@
 struct e1000_hw;
 
 #define E1000_DEV_ID_82576_VF                 0x10CA
+#define E1000_DEV_ID_I350_VF                  0x1520
 #define E1000_REVISION_0 0
 #define E1000_REVISION_1 1
 #define E1000_REVISION_2 2
@@ -133,6 +134,7 @@ struct e1000_adv_tx_context_desc {
 enum e1000_mac_type {
 	e1000_undefined = 0,
 	e1000_vfadapt,
+	e1000_vfadapt_i350,
 	e1000_num_macs  /* List is 1-based, so subtract 1 for true count. */
 };