Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 225396
b: refs/heads/master
c: 031d795
h: refs/heads/master
v: v3
  • Loading branch information
Williams, Mitch A authored and Jeff Kirsher committed Dec 25, 2010
1 parent ac6adaf commit 919ace9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0e512bfc2c0cd6072387092f8d1ac8e1a758965b
refs/heads/master: 031d7952ee63e1aa679f7e87700e3281f4de4ba2
1 change: 1 addition & 0 deletions trunk/drivers/net/igbvf/igbvf.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ struct igbvf_adapter;

enum igbvf_boards {
board_vf,
board_i350_vf,
};

struct igbvf_queue_stats {
Expand Down
9 changes: 9 additions & 0 deletions trunk/drivers/net/igbvf/netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

/**
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/net/igbvf/vf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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. */
};

Expand Down

0 comments on commit 919ace9

Please sign in to comment.