diff options
author | Anirban Chakraborty <anirban.chakraborty@qlogic.com> | 2010-06-03 03:50:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-03 23:03:45 -0400 |
commit | 87eb743b943a472eb90ac2cbf7f4a132773de77f (patch) | |
tree | 387f7f62cd73d0b2a72fac1b906c7808ae5788e8 /drivers/net/qlcnic | |
parent | c6d409cfd0fd41e7a0847875e4338ad648c9b96b (diff) |
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: 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>
Diffstat (limited to 'drivers/net/qlcnic')
-rw-r--r-- | drivers/net/qlcnic/qlcnic_main.c | 81 |
1 files changed, 40 insertions, 41 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index 119bcae5e74b..99371bcaa547 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c | |||
@@ -2581,6 +2581,46 @@ reschedule: | |||
2581 | qlcnic_schedule_work(adapter, qlcnic_fw_poll_work, FW_POLL_DELAY); | 2581 | qlcnic_schedule_work(adapter, qlcnic_fw_poll_work, FW_POLL_DELAY); |
2582 | } | 2582 | } |
2583 | 2583 | ||
2584 | static int | ||
2585 | qlcnicvf_start_firmware(struct qlcnic_adapter *adapter) | ||
2586 | { | ||
2587 | int err; | ||
2588 | |||
2589 | err = qlcnic_can_start_firmware(adapter); | ||
2590 | if (err) | ||
2591 | return err; | ||
2592 | |||
2593 | qlcnic_check_options(adapter); | ||
2594 | |||
2595 | adapter->need_fw_reset = 0; | ||
2596 | |||
2597 | return err; | ||
2598 | } | ||
2599 | |||
2600 | static int | ||
2601 | qlcnicvf_config_bridged_mode(struct qlcnic_adapter *adapter, u32 enable) | ||
2602 | { | ||
2603 | return -EOPNOTSUPP; | ||
2604 | } | ||
2605 | |||
2606 | static int | ||
2607 | qlcnicvf_config_led(struct qlcnic_adapter *adapter, u32 state, u32 rate) | ||
2608 | { | ||
2609 | return -EOPNOTSUPP; | ||
2610 | } | ||
2611 | |||
2612 | static int | ||
2613 | qlcnicvf_set_ilb_mode(struct qlcnic_adapter *adapter) | ||
2614 | { | ||
2615 | return -EOPNOTSUPP; | ||
2616 | } | ||
2617 | |||
2618 | static void | ||
2619 | qlcnicvf_clear_ilb_mode(struct qlcnic_adapter *adapter) | ||
2620 | { | ||
2621 | return; | ||
2622 | } | ||
2623 | |||
2584 | static ssize_t | 2624 | static ssize_t |
2585 | qlcnic_store_bridged_mode(struct device *dev, | 2625 | qlcnic_store_bridged_mode(struct device *dev, |
2586 | struct device_attribute *attr, const char *buf, size_t len) | 2626 | struct device_attribute *attr, const char *buf, size_t len) |
@@ -2954,47 +2994,6 @@ done: | |||
2954 | return NOTIFY_DONE; | 2994 | return NOTIFY_DONE; |
2955 | } | 2995 | } |
2956 | 2996 | ||
2957 | static int | ||
2958 | qlcnicvf_start_firmware(struct qlcnic_adapter *adapter) | ||
2959 | { | ||
2960 | int err; | ||
2961 | |||
2962 | err = qlcnic_can_start_firmware(adapter); | ||
2963 | if (err) | ||
2964 | return err; | ||
2965 | |||
2966 | qlcnic_check_options(adapter); | ||
2967 | |||
2968 | adapter->need_fw_reset = 0; | ||
2969 | |||
2970 | return err; | ||
2971 | } | ||
2972 | |||
2973 | static int | ||
2974 | qlcnicvf_config_bridged_mode(struct qlcnic_adapter *adapter, u32 enable) | ||
2975 | { | ||
2976 | return -EOPNOTSUPP; | ||
2977 | } | ||
2978 | |||
2979 | static int | ||
2980 | qlcnicvf_config_led(struct qlcnic_adapter *adapter, u32 state, u32 rate) | ||
2981 | { | ||
2982 | return -EOPNOTSUPP; | ||
2983 | } | ||
2984 | |||
2985 | static int | ||
2986 | qlcnicvf_set_ilb_mode(struct qlcnic_adapter *adapter) | ||
2987 | { | ||
2988 | return -EOPNOTSUPP; | ||
2989 | } | ||
2990 | |||
2991 | static void | ||
2992 | qlcnicvf_clear_ilb_mode(struct qlcnic_adapter *adapter) | ||
2993 | { | ||
2994 | return; | ||
2995 | } | ||
2996 | |||
2997 | |||
2998 | static struct notifier_block qlcnic_netdev_cb = { | 2997 | static struct notifier_block qlcnic_netdev_cb = { |
2999 | .notifier_call = qlcnic_netdev_event, | 2998 | .notifier_call = qlcnic_netdev_event, |
3000 | }; | 2999 | }; |