AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

qlcnic: Fix Compilation Issue when CONFIG_INET was not set

Browse Source 
Original code was placed incorrectly inside a block of code marked
with CONFIG_INET directive. Fix by moving it outside.

Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Tested-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Anirban Chakraborty 2010-06-03 07:50:56 +00:00 committed by David S. Miller
parent c6d409cfd0
commit 87eb743b94
1 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
drivers/net/qlcnic/qlcnic_main.c
View File

@ -2581,6 +2581,46 @@ qlcnic_fw_poll_work(struct work_struct *work)
qlcnic_schedule_work(adapter, qlcnic_fw_poll_work, FW_POLL_DELAY);
}
static int
qlcnicvf_start_firmware(struct qlcnic_adapter *adapter)
{
int err;
err = qlcnic_can_start_firmware(adapter);
if (err)
return err;
qlcnic_check_options(adapter);
adapter->need_fw_reset = 0;
return err;
}
static int
qlcnicvf_config_bridged_mode(struct qlcnic_adapter *adapter, u32 enable)
{
return -EOPNOTSUPP;
}
static int
qlcnicvf_config_led(struct qlcnic_adapter *adapter, u32 state, u32 rate)
{
return -EOPNOTSUPP;
}
static int
qlcnicvf_set_ilb_mode(struct qlcnic_adapter *adapter)
{
return -EOPNOTSUPP;
}
static void
qlcnicvf_clear_ilb_mode(struct qlcnic_adapter *adapter)
{
return;
}
static ssize_t
qlcnic_store_bridged_mode(struct device *dev,
struct device_attribute *attr, const char *buf, size_t len)
@ -2954,47 +2994,6 @@ qlcnic_inetaddr_event(struct notifier_block *this,
return NOTIFY_DONE;
}
static int
qlcnicvf_start_firmware(struct qlcnic_adapter *adapter)
{
int err;
err = qlcnic_can_start_firmware(adapter);
if (err)
return err;
qlcnic_check_options(adapter);
adapter->need_fw_reset = 0;
return err;
}
static int
qlcnicvf_config_bridged_mode(struct qlcnic_adapter *adapter, u32 enable)
{
return -EOPNOTSUPP;
}
static int
qlcnicvf_config_led(struct qlcnic_adapter *adapter, u32 state, u32 rate)
{
return -EOPNOTSUPP;
}
static int
qlcnicvf_set_ilb_mode(struct qlcnic_adapter *adapter)
{
return -EOPNOTSUPP;
}
static void
qlcnicvf_clear_ilb_mode(struct qlcnic_adapter *adapter)
{
return;
}
static struct notifier_block qlcnic_netdev_cb = {
.notifier_call = qlcnic_netdev_event,
};