- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / drivers / scsi / bfa / bfa_port_priv.h

diff --git a/drivers/scsi/bfa/bfa_port_priv.h b/drivers/scsi/bfa/bfa_port_priv.h
index 9cc0c70..51f698a 100644 (file)
--- a/drivers/scsi/bfa/bfa_port_priv.h
+++ b/drivers/scsi/bfa/bfa_port_priv.h
@@ -23,19 +23,9 @@
 #include "bfa_intr_priv.h"
 
 /**
- * Link notification data structure
+ * BFA physical port data structure
  */
-struct bfa_fcport_ln_s {
-       struct bfa_fcport_s     *fcport;
-       bfa_sm_t                sm;
-       struct bfa_cb_qe_s      ln_qe;  /*  BFA callback queue elem for ln */
-       enum bfa_pport_linkstate ln_event; /*  ln event for callback */
-};
-
-/**
- * BFA FC port data structure
- */
-struct bfa_fcport_s {
+struct bfa_pport_s {
        struct bfa_s            *bfa;   /*  parent BFA instance */
        bfa_sm_t                sm;     /*  port state machine */
        wwn_t                   nwwn;   /*  node wwn of physical port */
@@ -46,8 +36,6 @@ struct bfa_fcport_s {
        enum bfa_pport_topology topology;       /*  current topology */
        u8                      myalpa; /*  my ALPA in LOOP topology */
        u8                      rsvd[3];
-       u32             mypid:24;
-       u32             rsvd_b:8;
        struct bfa_pport_cfg_s  cfg;    /*  current port configuration */
        struct bfa_qos_attr_s  qos_attr;   /* QoS Attributes */
        struct bfa_qos_vc_attr_s qos_vc_attr;  /*  VC info from ELP */
@@ -61,31 +49,42 @@ struct bfa_fcport_s {
        void                    (*event_cbfn) (void *cbarg,
                                                bfa_pport_event_t event);
        union {
-               union bfi_fcport_i2h_msg_u i2hmsg;
+               union bfi_pport_i2h_msg_u i2hmsg;
        } event_arg;
        void                    *bfad;  /*  BFA driver handle */
-       struct bfa_fcport_ln_s  ln; /*  Link Notification */
-       struct bfa_cb_qe_s      hcb_qe; /*  BFA callback queue elem */
-       struct bfa_timer_s      timer;  /*  timer */
+       struct bfa_cb_qe_s              hcb_qe; /*  BFA callback queue elem */
+       enum bfa_pport_linkstate        hcb_event;
+                                       /*  link event for callback */
        u32             msgtag; /*  fimrware msg tag for reply */
        u8                      *stats_kva;
        u64             stats_pa;
-       union bfa_fcport_stats_u *stats;
-       union bfa_fcport_stats_u *stats_ret; /*  driver stats location */
-       bfa_status_t            stats_status; /*  stats/statsclr status */
-       bfa_boolean_t           stats_busy; /*  outstanding stats/statsclr */
+       union bfa_pport_stats_u *stats; /*  pport stats */
+       u32             mypid:24;
+       u32             rsvd_b:8;
+       struct bfa_timer_s      timer;  /*  timer */
+       union bfa_pport_stats_u         *stats_ret;
+                                       /*  driver stats location */
+       bfa_status_t            stats_status;
+                                       /*  stats/statsclr status */
+       bfa_boolean_t           stats_busy;
+                                       /*  outstanding stats/statsclr */
        bfa_boolean_t           stats_qfull;
-       bfa_cb_pport_t          stats_cbfn; /*  driver callback function */
-       void                    *stats_cbarg; /* *!< user callback arg */
-       bfa_boolean_t           diag_busy; /*  diag busy status */
-       bfa_boolean_t           beacon; /*  port beacon status */
-       bfa_boolean_t           link_e2e_beacon; /*  link beacon status */
+       bfa_boolean_t           diag_busy;
+                                       /*  diag busy status */
+       bfa_boolean_t           beacon;
+                                       /*  port beacon status */
+       bfa_boolean_t           link_e2e_beacon;
+                                       /*  link beacon status */
+       bfa_cb_pport_t          stats_cbfn;
+                                       /*  driver callback function */
+       void                    *stats_cbarg;
+                                       /* *!< user callback arg */
 };
 
-#define BFA_FCPORT_MOD(__bfa)  (&(__bfa)->modules.fcport)
+#define BFA_PORT_MOD(__bfa)    (&(__bfa)->modules.pport)
 
 /*
  * public functions
  */
-void   bfa_fcport_isr(struct bfa_s *bfa, struct bfi_msg_s *msg);
+void   bfa_pport_isr(struct bfa_s *bfa, struct bfi_msg_s *msg);
 #endif /* __BFA_PORT_PRIV_H__ */