Merge tag 'firewire-update2' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139...

[deliverable/linux.git] / drivers / net / ethernet / qlogic / qed / qed_sp.h

diff --git a/drivers/net/ethernet/qlogic/qed/qed_sp.h b/drivers/net/ethernet/qlogic/qed/qed_sp.h
index 287fadfab52d754e0a913d4ed044ca7e50cf1a09..d39f914b66ee869714b023fad1fd1a557c369208 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_sp.h
+++ b/drivers/net/ethernet/qlogic/qed/qed_sp.h
@@ -311,19 +311,20 @@ void qed_consq_free(struct qed_hwfn *p_hwfn,
 #define QED_SP_EQ_COMPLETION  0x01
 #define QED_SP_CQE_COMPLETION 0x02
 
-struct qed_sp_init_request_params {
-       size_t                  ramrod_data_size;
+struct qed_sp_init_data {
+       u32                     cid;
+       u16                     opaque_fid;
+
+       /* Information regarding operation upon sending & completion */
        enum spq_mode           comp_mode;
        struct qed_spq_comp_cb *p_comp_data;
 };
 
 int qed_sp_init_request(struct qed_hwfn *p_hwfn,
                        struct qed_spq_entry **pp_ent,
-                       u32 cid,
-                       u16 opaque_fid,
                        u8 cmd,
                        u8 protocol,
-                       struct qed_sp_init_request_params *p_params);
+                       struct qed_sp_init_data *p_data);
 
 /**
  * @brief qed_sp_pf_start - PF Function Start Ramrod
@@ -343,7 +344,7 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,
  */
 
 int qed_sp_pf_start(struct qed_hwfn *p_hwfn,
-                   enum mf_mode mode);
+                   enum qed_mf_mode mode);
 
 /**
  * @brief qed_sp_pf_stop - PF Function Stop Ramrod