diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-12 05:09:04 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-12 05:09:04 (GMT) |
commit | 58bb4bd0e0b1ab560a7320a760141ba52db68791 (patch) | |
tree | 47ca0cfe15778e851c7515e5eac1f9df0593c90c /drivers/net/igb/e1000_82575.c | |
parent | dd68153def6b890a23288776cbd5bd2bad223a3f (diff) | |
parent | 1b1c0a489c1dcc1fa640c13404ca69e7beae07d9 (diff) | |
download | linux-fsl-qoriq-58bb4bd0e0b1ab560a7320a760141ba52db68791.tar.xz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/igb/e1000_82575.c')
-rw-r--r-- | drivers/net/igb/e1000_82575.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c index c1552b6..65c1833 100644 --- a/drivers/net/igb/e1000_82575.c +++ b/drivers/net/igb/e1000_82575.c @@ -238,9 +238,15 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) size = 14; nvm->word_size = 1 << size; - /* if 82576 then initialize mailbox parameters */ - if (mac->type == e1000_82576) + /* if part supports SR-IOV then initialize mailbox parameters */ + switch (mac->type) { + case e1000_82576: + case e1000_i350: igb_init_mbx_params_pf(hw); + break; + default: + break; + } /* setup PHY parameters */ if (phy->media_type != e1000_media_type_copper) { |