aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Keller <jacob.e.keller@intel.com>2011-09-07 23:50:54 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-10-05 05:54:05 -0400
commit2466dd9ca11ea9e4400eb8477a9df2a0fe539d47 (patch)
treec4e86022592354ce06877d5ffebec5433d2a44bf
parente1befd774a049bdc85cf0ed5b307f913b33e1691 (diff)
ixgbe: fix driver version initialization in firmware
This patch fixes an issue with storing the driver version for the firmware. If the os does not support the particular firmware management tools, the firmware requires a driver version to be written as 0xFFFFFFFF rather than the actual driver version. Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Tested-by: Stephen Ko <stephen.s.ko@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index ed922726daab..1a3b91f09c08 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7587,10 +7587,12 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
7587 ixgbe_vf_configuration(pdev, (i | 0x10000000)); 7587 ixgbe_vf_configuration(pdev, (i | 0x10000000));
7588 } 7588 }
7589 7589
7590 /* Inform firmware of driver version */ 7590 /* firmware requires driver version to be 0xFFFFFFFF
7591 * since os does not support feature
7592 */
7591 if (hw->mac.ops.set_fw_drv_ver) 7593 if (hw->mac.ops.set_fw_drv_ver)
7592 hw->mac.ops.set_fw_drv_ver(hw, MAJ, MIN, BUILD, 7594 hw->mac.ops.set_fw_drv_ver(hw, 0xFF, 0xFF, 0xFF,
7593 FW_CEM_UNUSED_VER); 7595 0xFF);
7594 7596
7595 /* add san mac addr to netdev */ 7597 /* add san mac addr to netdev */
7596 ixgbe_add_sanmac_netdev(netdev); 7598 ixgbe_add_sanmac_netdev(netdev);