Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87eb743b authored by Anirban Chakraborty's avatar Anirban Chakraborty Committed by David S. Miller
Browse files

qlcnic: Fix Compilation Issue when CONFIG_INET was not set 



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

Signed-off-by: default avatarAnirban Chakraborty <anirban.chakraborty@qlogic.com>
Reported-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Tested-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c6d409cf

drivers/net/qlcnic/qlcnic_main.c

+40 −41
Original line number Diff line number Diff line
@@ -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,

};