mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-12 15:49:17 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: (31 commits) [SCSI] qla2xxx: Update version number to 8.03.00-k4. [SCSI] qla2xxx: Correct overwrite of pre-assigned init-control-block structure size. [SCSI] qla2xxx: Correct truncation in return-code status checking. [SCSI] qla2xxx: Correct vport delete bug. [SCSI] qla2xxx: Use correct value for max vport in LOOP topology. [SCSI] qla2xxx: Correct address range checking for option-rom updates. [SCSI] fcoe: Change fcoe receive thread nice value from 19 (lowest priority) to -20 [SCSI] fcoe: fix handling of pending queue, prevent out of order frames (v3) [SCSI] fcoe: Out of order tx frames was causing several check condition SCSI status [SCSI] fcoe: fix kfree(skb) [SCSI] fcoe: ETH_P_8021Q is already in if_ether and fcoe is not using it anyway [SCSI] libfc: do not change the fh_rx_id of a recevied frame [SCSI] fcoe: Correct fcoe_transports initialization vs. registration [SCSI] fcoe: Use setup_timer() and mod_timer() [SCSI] libfc, fcoe: Remove unnecessary cast by removing inline wrapper [SCSI] libfc, fcoe: Cleanup function formatting and minor typos [SCSI] libfc, fcoe: Fix kerneldoc comments [SCSI] libfc: Cleanup libfc_function_template comments [SCSI] libfc: check for err when recv and state is incorrect [SCSI] libfc: rename rp to rdata in fc_disc_new_target() ...
This commit is contained in:
Linus Torvalds
commit
228b5b7e84
19 changed files with 586 additions and 631 deletions
|
|
@ -31,10 +31,6 @@
|
|||
#define ETH_P_FCOE 0x8906 /* FCOE ether type */
|
||||
#endif
|
||||
|
||||
#ifndef ETH_P_8021Q
|
||||
#define ETH_P_8021Q 0x8100
|
||||
#endif
|
||||
|
||||
/*
|
||||
* FC_FCOE_OUI hasn't been standardized yet. XXX TBD.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -337,4 +337,9 @@ enum fc_pf_rjt_reason {
|
|||
FC_RJT_VENDOR = 0xff, /* vendor specific reject */
|
||||
};
|
||||
|
||||
/* default timeout values */
|
||||
|
||||
#define FC_DEF_E_D_TOV 2000UL
|
||||
#define FC_DEF_R_A_TOV 10000UL
|
||||
|
||||
#endif /* _FC_FS_H_ */
|
||||
|
|
|
|||
|
|
@ -68,9 +68,6 @@
|
|||
/*
|
||||
* FC HBA status
|
||||
*/
|
||||
#define FC_PAUSE (1 << 1)
|
||||
#define FC_LINK_UP (1 << 0)
|
||||
|
||||
enum fc_lport_state {
|
||||
LPORT_ST_NONE = 0,
|
||||
LPORT_ST_FLOGI,
|
||||
|
|
@ -339,31 +336,17 @@ struct fc_exch {
|
|||
|
||||
struct libfc_function_template {
|
||||
|
||||
/**
|
||||
* Mandatory Fields
|
||||
*
|
||||
* These handlers must be implemented by the LLD.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Interface to send a FC frame
|
||||
*
|
||||
* STATUS: REQUIRED
|
||||
*/
|
||||
int (*frame_send)(struct fc_lport *lp, struct fc_frame *fp);
|
||||
|
||||
/**
|
||||
* Optional Fields
|
||||
*
|
||||
* The LLD may choose to implement any of the following handlers.
|
||||
* If LLD doesn't specify hander and leaves its pointer NULL then
|
||||
* the default libfc function will be used for that handler.
|
||||
*/
|
||||
|
||||
/**
|
||||
* ELS/CT interfaces
|
||||
*/
|
||||
|
||||
/*
|
||||
* elsct_send - sends ELS/CT frame
|
||||
* Interface to send ELS/CT frames
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
struct fc_seq *(*elsct_send)(struct fc_lport *lport,
|
||||
struct fc_rport *rport,
|
||||
|
|
@ -373,9 +356,6 @@ struct libfc_function_template {
|
|||
struct fc_frame *fp,
|
||||
void *arg),
|
||||
void *arg, u32 timer_msec);
|
||||
/**
|
||||
* Exhance Manager interfaces
|
||||
*/
|
||||
|
||||
/*
|
||||
* Send the FC frame payload using a new exchange and sequence.
|
||||
|
|
@ -407,6 +387,8 @@ struct libfc_function_template {
|
|||
* timer_msec argument is specified. The timer is canceled when
|
||||
* it fires or when the exchange is done. The exchange timeout handler
|
||||
* is registered by EM layer.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
struct fc_seq *(*exch_seq_send)(struct fc_lport *lp,
|
||||
struct fc_frame *fp,
|
||||
|
|
@ -418,14 +400,18 @@ struct libfc_function_template {
|
|||
void *arg, unsigned int timer_msec);
|
||||
|
||||
/*
|
||||
* send a frame using existing sequence and exchange.
|
||||
* Send a frame using an existing sequence and exchange.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
int (*seq_send)(struct fc_lport *lp, struct fc_seq *sp,
|
||||
struct fc_frame *fp);
|
||||
|
||||
/*
|
||||
* Send ELS response using mainly infomation
|
||||
* in exchange and sequence in EM layer.
|
||||
* Send an ELS response using infomation from a previous
|
||||
* exchange and sequence.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
void (*seq_els_rsp_send)(struct fc_seq *sp, enum fc_els_cmd els_cmd,
|
||||
struct fc_seq_els_data *els_data);
|
||||
|
|
@ -437,6 +423,8 @@ struct libfc_function_template {
|
|||
* A timer_msec can be specified for abort timeout, if non-zero
|
||||
* timer_msec value is specified then exchange resp handler
|
||||
* will be called with timeout error if no response to abort.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
int (*seq_exch_abort)(const struct fc_seq *req_sp,
|
||||
unsigned int timer_msec);
|
||||
|
|
@ -444,6 +432,8 @@ struct libfc_function_template {
|
|||
/*
|
||||
* Indicate that an exchange/sequence tuple is complete and the memory
|
||||
* allocated for the related objects may be freed.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
void (*exch_done)(struct fc_seq *sp);
|
||||
|
||||
|
|
@ -451,6 +441,8 @@ struct libfc_function_template {
|
|||
* Assigns a EM and a free XID for an new exchange and then
|
||||
* allocates a new exchange and sequence pair.
|
||||
* The fp can be used to determine free XID.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
struct fc_exch *(*exch_get)(struct fc_lport *lp, struct fc_frame *fp);
|
||||
|
||||
|
|
@ -458,12 +450,16 @@ struct libfc_function_template {
|
|||
* Release previously assigned XID by exch_get API.
|
||||
* The LLD may implement this if XID is assigned by LLD
|
||||
* in exch_get().
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
void (*exch_put)(struct fc_lport *lp, struct fc_exch_mgr *mp,
|
||||
u16 ex_id);
|
||||
|
||||
/*
|
||||
* Start a new sequence on the same exchange/sequence tuple.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
struct fc_seq *(*seq_start_next)(struct fc_seq *sp);
|
||||
|
||||
|
|
@ -471,26 +467,38 @@ struct libfc_function_template {
|
|||
* Reset an exchange manager, completing all sequences and exchanges.
|
||||
* If s_id is non-zero, reset only exchanges originating from that FID.
|
||||
* If d_id is non-zero, reset only exchanges sending to that FID.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
void (*exch_mgr_reset)(struct fc_exch_mgr *,
|
||||
void (*exch_mgr_reset)(struct fc_lport *,
|
||||
u32 s_id, u32 d_id);
|
||||
|
||||
void (*rport_flush_queue)(void);
|
||||
/**
|
||||
* Local Port interfaces
|
||||
/*
|
||||
* Flush the rport work queue. Generally used before shutdown.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
void (*rport_flush_queue)(void);
|
||||
|
||||
/*
|
||||
* Receive a frame to a local port.
|
||||
* Receive a frame for a local port.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
void (*lport_recv)(struct fc_lport *lp, struct fc_seq *sp,
|
||||
struct fc_frame *fp);
|
||||
|
||||
/*
|
||||
* Reset the local port.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
int (*lport_reset)(struct fc_lport *);
|
||||
|
||||
/**
|
||||
* Remote Port interfaces
|
||||
/*
|
||||
* Create a remote port
|
||||
*/
|
||||
struct fc_rport *(*rport_create)(struct fc_disc_port *);
|
||||
|
||||
/*
|
||||
* Initiates the RP state machine. It is called from the LP module.
|
||||
|
|
@ -500,26 +508,33 @@ struct libfc_function_template {
|
|||
* - PLOGI
|
||||
* - PRLI
|
||||
* - RTV
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
int (*rport_login)(struct fc_rport *rport);
|
||||
|
||||
/*
|
||||
* Logoff, and remove the rport from the transport if
|
||||
* it had been added. This will send a LOGO to the target.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
int (*rport_logoff)(struct fc_rport *rport);
|
||||
|
||||
/*
|
||||
* Recieve a request from a remote port.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
void (*rport_recv_req)(struct fc_seq *, struct fc_frame *,
|
||||
struct fc_rport *);
|
||||
|
||||
struct fc_rport *(*rport_lookup)(const struct fc_lport *, u32);
|
||||
|
||||
/**
|
||||
* FCP interfaces
|
||||
/*
|
||||
* lookup an rport by it's port ID.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
struct fc_rport *(*rport_lookup)(const struct fc_lport *, u32);
|
||||
|
||||
/*
|
||||
* Send a fcp cmd from fsp pkt.
|
||||
|
|
@ -527,30 +542,38 @@ struct libfc_function_template {
|
|||
*
|
||||
* The resp handler is called when FCP_RSP received.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
int (*fcp_cmd_send)(struct fc_lport *lp, struct fc_fcp_pkt *fsp,
|
||||
void (*resp)(struct fc_seq *, struct fc_frame *fp,
|
||||
void *arg));
|
||||
|
||||
/*
|
||||
* Used at least durring linkdown and reset
|
||||
* Cleanup the FCP layer, used durring link down and reset
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
void (*fcp_cleanup)(struct fc_lport *lp);
|
||||
|
||||
/*
|
||||
* Abort all I/O on a local port
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
void (*fcp_abort_io)(struct fc_lport *lp);
|
||||
|
||||
/**
|
||||
* Discovery interfaces
|
||||
/*
|
||||
* Receive a request for the discovery layer.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
|
||||
void (*disc_recv_req)(struct fc_seq *,
|
||||
struct fc_frame *, struct fc_lport *);
|
||||
|
||||
/*
|
||||
* Start discovery for a local port.
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
void (*disc_start)(void (*disc_callback)(struct fc_lport *,
|
||||
enum fc_disc_event),
|
||||
|
|
@ -559,6 +582,8 @@ struct libfc_function_template {
|
|||
/*
|
||||
* Stop discovery for a given lport. This will remove
|
||||
* all discovered rports
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
void (*disc_stop) (struct fc_lport *);
|
||||
|
||||
|
|
@ -566,6 +591,8 @@ struct libfc_function_template {
|
|||
* Stop discovery for a given lport. This will block
|
||||
* until all discovered rports are deleted from the
|
||||
* FC transport class
|
||||
*
|
||||
* STATUS: OPTIONAL
|
||||
*/
|
||||
void (*disc_stop_final) (struct fc_lport *);
|
||||
};
|
||||
|
|
@ -603,7 +630,8 @@ struct fc_lport {
|
|||
|
||||
/* Operational Information */
|
||||
struct libfc_function_template tt;
|
||||
u16 link_status;
|
||||
u8 link_up;
|
||||
u8 qfull;
|
||||
enum fc_lport_state state;
|
||||
unsigned long boot_time;
|
||||
|
||||
|
|
@ -637,7 +665,7 @@ struct fc_lport {
|
|||
struct delayed_work disc_work;
|
||||
};
|
||||
|
||||
/**
|
||||
/*
|
||||
* FC_LPORT HELPER FUNCTIONS
|
||||
*****************************/
|
||||
static inline void *lport_priv(const struct fc_lport *lp)
|
||||
|
|
@ -669,7 +697,7 @@ static inline void fc_lport_state_enter(struct fc_lport *lp,
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
/*
|
||||
* LOCAL PORT LAYER
|
||||
*****************************/
|
||||
int fc_lport_init(struct fc_lport *lp);
|
||||
|
|
@ -703,12 +731,6 @@ void fc_linkup(struct fc_lport *);
|
|||
*/
|
||||
void fc_linkdown(struct fc_lport *);
|
||||
|
||||
/*
|
||||
* Pause and unpause traffic.
|
||||
*/
|
||||
void fc_pause(struct fc_lport *);
|
||||
void fc_unpause(struct fc_lport *);
|
||||
|
||||
/*
|
||||
* Configure the local port.
|
||||
*/
|
||||
|
|
@ -725,19 +747,19 @@ int fc_lport_reset(struct fc_lport *);
|
|||
int fc_set_mfs(struct fc_lport *lp, u32 mfs);
|
||||
|
||||
|
||||
/**
|
||||
/*
|
||||
* REMOTE PORT LAYER
|
||||
*****************************/
|
||||
int fc_rport_init(struct fc_lport *lp);
|
||||
void fc_rport_terminate_io(struct fc_rport *rp);
|
||||
|
||||
/**
|
||||
/*
|
||||
* DISCOVERY LAYER
|
||||
*****************************/
|
||||
int fc_disc_init(struct fc_lport *lp);
|
||||
|
||||
|
||||
/**
|
||||
/*
|
||||
* SCSI LAYER
|
||||
*****************************/
|
||||
/*
|
||||
|
|
@ -798,7 +820,7 @@ int fc_change_queue_type(struct scsi_device *sdev, int tag_type);
|
|||
*/
|
||||
void fc_fcp_destroy(struct fc_lport *);
|
||||
|
||||
/**
|
||||
/*
|
||||
* ELS/CT interface
|
||||
*****************************/
|
||||
/*
|
||||
|
|
@ -807,7 +829,7 @@ void fc_fcp_destroy(struct fc_lport *);
|
|||
int fc_elsct_init(struct fc_lport *lp);
|
||||
|
||||
|
||||
/**
|
||||
/*
|
||||
* EXCHANGE MANAGER LAYER
|
||||
*****************************/
|
||||
/*
|
||||
|
|
@ -916,7 +938,7 @@ struct fc_seq *fc_seq_start_next(struct fc_seq *sp);
|
|||
* If s_id is non-zero, reset only exchanges originating from that FID.
|
||||
* If d_id is non-zero, reset only exchanges sending to that FID.
|
||||
*/
|
||||
void fc_exch_mgr_reset(struct fc_exch_mgr *, u32 s_id, u32 d_id);
|
||||
void fc_exch_mgr_reset(struct fc_lport *, u32 s_id, u32 d_id);
|
||||
|
||||
/*
|
||||
* Functions for fc_functions_template
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ struct fcoe_softc {
|
|||
struct net_device *phys_dev; /* device with ethtool_ops */
|
||||
struct packet_type fcoe_packet_type;
|
||||
struct sk_buff_head fcoe_pending_queue;
|
||||
u8 fcoe_pending_queue_active;
|
||||
|
||||
u8 dest_addr[ETH_ALEN];
|
||||
u8 ctl_src_addr[ETH_ALEN];
|
||||
|
|
@ -58,16 +59,10 @@ struct fcoe_softc {
|
|||
u8 address_mode;
|
||||
};
|
||||
|
||||
static inline struct fcoe_softc *fcoe_softc(
|
||||
const struct fc_lport *lp)
|
||||
{
|
||||
return (struct fcoe_softc *)lport_priv(lp);
|
||||
}
|
||||
|
||||
static inline struct net_device *fcoe_netdev(
|
||||
const struct fc_lport *lp)
|
||||
{
|
||||
return fcoe_softc(lp)->real_dev;
|
||||
return ((struct fcoe_softc *)lport_priv(lp))->real_dev;
|
||||
}
|
||||
|
||||
static inline struct fcoe_hdr *skb_fcoe_header(const struct sk_buff *skb)
|
||||
|
|
|
|||
Loading…
Reference in a new issue