diff options
author | Vasu Dev <vasu.dev@intel.com> | 2009-03-17 14:42:24 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-04-03 10:23:06 -0400 |
commit | fdd78027fd472351783fb6110a72d991c1a07402 (patch) | |
tree | 47b4ba0804601873cb15a739a1f5c91e46660655 /drivers/scsi/fcoe/fcoe.c | |
parent | 5e80f7f7c87990ffe7856a0d35a94ea52b8f4c59 (diff) |
[SCSI] fcoe: cleans up libfcoe.h and adds fcoe.h for fcoe module
Removes no where used several inline functions prefixed with skb_*
and be16_to_cpu.
Moves fcoe module specific func prototypes to fcoe.c from libfcoe.h,
moved only need for build.
Adds fcoe module header file fcoe.h and then moves fcoe module
specific fcoe_percpu_s and fcoe_softc to fcoe.h from libfcoe.h.
Moves all defines from fcoe.c to fcoe.h since now fcoe module
has its own header file fcoe.h.
[jejb: removed EXPORT_SYMBOL_GPL(fcoe_fc_crc) which caused a section mismatch]
Signed-off-by: Vasu Dev <vasu.dev@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/fcoe/fcoe.c')
-rw-r--r-- | drivers/scsi/fcoe/fcoe.c | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 42eee5b7e5c5..30161a26387a 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c | |||
@@ -19,15 +19,12 @@ | |||
19 | 19 | ||
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | #include <linux/version.h> | 21 | #include <linux/version.h> |
22 | #include <linux/kernel.h> | ||
23 | #include <linux/spinlock.h> | 22 | #include <linux/spinlock.h> |
24 | #include <linux/skbuff.h> | ||
25 | #include <linux/netdevice.h> | 23 | #include <linux/netdevice.h> |
26 | #include <linux/etherdevice.h> | 24 | #include <linux/etherdevice.h> |
27 | #include <linux/ethtool.h> | 25 | #include <linux/ethtool.h> |
28 | #include <linux/if_ether.h> | 26 | #include <linux/if_ether.h> |
29 | #include <linux/if_vlan.h> | 27 | #include <linux/if_vlan.h> |
30 | #include <linux/kthread.h> | ||
31 | #include <linux/crc32.h> | 28 | #include <linux/crc32.h> |
32 | #include <linux/cpu.h> | 29 | #include <linux/cpu.h> |
33 | #include <linux/fs.h> | 30 | #include <linux/fs.h> |
@@ -45,28 +42,9 @@ | |||
45 | #include <scsi/fc_frame.h> | 42 | #include <scsi/fc_frame.h> |
46 | #include <scsi/libfcoe.h> | 43 | #include <scsi/libfcoe.h> |
47 | 44 | ||
48 | static int debug_fcoe; | 45 | #include "fcoe.h" |
49 | |||
50 | #define FCOE_MAX_QUEUE_DEPTH 256 | ||
51 | #define FCOE_LOW_QUEUE_DEPTH 32 | ||
52 | |||
53 | /* destination address mode */ | ||
54 | #define FCOE_GW_ADDR_MODE 0x00 | ||
55 | #define FCOE_FCOUI_ADDR_MODE 0x01 | ||
56 | |||
57 | #define FCOE_WORD_TO_BYTE 4 | ||
58 | |||
59 | #define FCOE_VERSION "0.1" | ||
60 | #define FCOE_NAME "fcoe" | ||
61 | #define FCOE_VENDOR "Open-FCoE.org" | ||
62 | |||
63 | #define FCOE_MAX_LUN 255 | ||
64 | #define FCOE_MAX_FCP_TARGET 256 | ||
65 | 46 | ||
66 | #define FCOE_MAX_OUTSTANDING_COMMANDS 1024 | 47 | static int debug_fcoe; |
67 | |||
68 | #define FCOE_MIN_XID 0x0001 /* the min xid supported by fcoe_sw */ | ||
69 | #define FCOE_MAX_XID 0x07ef /* the max xid supported by fcoe_sw */ | ||
70 | 48 | ||
71 | MODULE_AUTHOR("Open-FCoE.org"); | 49 | MODULE_AUTHOR("Open-FCoE.org"); |
72 | MODULE_DESCRIPTION("FCoE"); | 50 | MODULE_DESCRIPTION("FCoE"); |
@@ -78,8 +56,22 @@ DEFINE_RWLOCK(fcoe_hostlist_lock); | |||
78 | DEFINE_TIMER(fcoe_timer, NULL, 0, 0); | 56 | DEFINE_TIMER(fcoe_timer, NULL, 0, 0); |
79 | DEFINE_PER_CPU(struct fcoe_percpu_s, fcoe_percpu); | 57 | DEFINE_PER_CPU(struct fcoe_percpu_s, fcoe_percpu); |
80 | 58 | ||
81 | |||
82 | /* Function Prototyes */ | 59 | /* Function Prototyes */ |
60 | static int fcoe_reset(struct Scsi_Host *shost); | ||
61 | static int fcoe_xmit(struct fc_lport *, struct fc_frame *); | ||
62 | static int fcoe_rcv(struct sk_buff *, struct net_device *, | ||
63 | struct packet_type *, struct net_device *); | ||
64 | static int fcoe_percpu_receive_thread(void *arg); | ||
65 | static void fcoe_clean_pending_queue(struct fc_lport *lp); | ||
66 | static void fcoe_percpu_clean(struct fc_lport *lp); | ||
67 | static int fcoe_link_ok(struct fc_lport *lp); | ||
68 | |||
69 | static struct fc_lport *fcoe_hostlist_lookup(const struct net_device *); | ||
70 | static int fcoe_hostlist_add(const struct fc_lport *); | ||
71 | static int fcoe_hostlist_remove(const struct fc_lport *); | ||
72 | |||
73 | static struct Scsi_Host *fcoe_host_alloc(struct scsi_host_template *, int); | ||
74 | |||
83 | static int fcoe_check_wait_queue(struct fc_lport *); | 75 | static int fcoe_check_wait_queue(struct fc_lport *); |
84 | static void fcoe_recv_flogi(struct fcoe_softc *, struct fc_frame *, u8 *); | 76 | static void fcoe_recv_flogi(struct fcoe_softc *, struct fc_frame *, u8 *); |
85 | static int fcoe_device_notification(struct notifier_block *, ulong, void *); | 77 | static int fcoe_device_notification(struct notifier_block *, ulong, void *); |
@@ -919,7 +911,6 @@ u32 fcoe_fc_crc(struct fc_frame *fp) | |||
919 | } | 911 | } |
920 | return crc; | 912 | return crc; |
921 | } | 913 | } |
922 | EXPORT_SYMBOL_GPL(fcoe_fc_crc); | ||
923 | 914 | ||
924 | /** | 915 | /** |
925 | * fcoe_xmit() - FCoE frame transmit function | 916 | * fcoe_xmit() - FCoE frame transmit function |