diff options
| author | Amit Kumar Salecha <amit.salecha@qlogic.com> | 2010-05-17 03:22:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-18 02:30:54 +0200 |
| commit | 4d5bdb384813f1928016661f28fd45f8327c081d (patch) | |
| tree | e8de3d90c5f7a6e53e6571bcd48dc45528269f07 /drivers/net/qlcnic | |
| parent | qlcnic: fix rx bytes statistics (diff) | |
| download | linux-4d5bdb384813f1928016661f28fd45f8327c081d.tar.xz linux-4d5bdb384813f1928016661f28fd45f8327c081d.zip | |
qlcnic: module param for firmware load option
By default fw is loaded from flash, user can
change this priority using load_fw_file module param.
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlcnic')
| -rw-r--r-- | drivers/net/qlcnic/qlcnic_main.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index 0a52d24cae78..b076474389b9 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c @@ -61,6 +61,10 @@ static int auto_fw_reset = AUTO_FW_RESET_ENABLED; module_param(auto_fw_reset, int, 0644); MODULE_PARM_DESC(auto_fw_reset, "Auto firmware reset (0=disabled, 1=enabled"); +static int load_fw_file; +module_param(load_fw_file, int, 0644); +MODULE_PARM_DESC(load_fw_file, "Load firmware from (0=flash, 1=file"); + static int __devinit qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent); static void __devexit qlcnic_remove(struct pci_dev *pdev); @@ -585,7 +589,10 @@ qlcnic_start_firmware(struct qlcnic_adapter *adapter) /* This is the first boot after power up */ QLCWR32(adapter, QLCNIC_CAM_RAM(0x1fc), QLCNIC_BDINFO_MAGIC); - qlcnic_request_firmware(adapter); + if (load_fw_file) + qlcnic_request_firmware(adapter); + else + adapter->fw_type = QLCNIC_FLASH_ROMIMAGE; err = qlcnic_need_fw_reset(adapter); if (err < 0) |