Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/via-velocity.c
	drivers/net/wireless/iwlwifi/iwl-agn.c

1 files changed, 31 insertions, 28 deletions

diff --git a/drivers/scsi/bfa/fabric.c b/drivers/scsi/bfa/fabric.c
index a4b5dd449573..8166e9745ec0 100644
--- a/drivers/scsi/bfa/fabric.c
+++ b/drivers/scsi/bfa/fabric.c
@@ -37,7 +37,7 @@ BFA_TRC_FILE(FCS, FABRIC);
 #define BFA_FCS_FABRIC_CLEANUP_DELAY    (10000) /* Milliseconds */
 
 #define bfa_fcs_fabric_set_opertype(__fabric) do {             \
-        if (bfa_pport_get_topology((__fabric)->fcs->bfa)       \
+        if (bfa_fcport_get_topology((__fabric)->fcs->bfa)       \
                                 == BFA_PPORT_TOPOLOGY_P2P)     \
                 (__fabric)->oper_type = BFA_PPORT_TYPE_NPORT;  \
         else                                                   \
@@ -136,8 +136,7 @@ bfa_fcs_fabric_sm_uninit(struct bfa_fcs_fabric_s *fabric,
         case BFA_FCS_FABRIC_SM_CREATE:
                 bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_created);
                 bfa_fcs_fabric_init(fabric);
-                bfa_fcs_lport_init(&fabric->bport, fabric->fcs, FC_VF_ID_NULL,
-                                   &fabric->bport.port_cfg, NULL);
+                bfa_fcs_lport_init(&fabric->bport, &fabric->bport.port_cfg);
                 break;
 
         case BFA_FCS_FABRIC_SM_LINK_UP:
@@ -161,7 +160,7 @@ bfa_fcs_fabric_sm_created(struct bfa_fcs_fabric_s *fabric,
 
         switch (event) {
         case BFA_FCS_FABRIC_SM_START:
-                if (bfa_pport_is_linkup(fabric->fcs->bfa)) {
+                if (bfa_fcport_is_linkup(fabric->fcs->bfa)) {
                         bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_flogi);
                         bfa_fcs_fabric_login(fabric);
                 } else
@@ -225,7 +224,7 @@ bfa_fcs_fabric_sm_flogi(struct bfa_fcs_fabric_s *fabric,
         switch (event) {
         case BFA_FCS_FABRIC_SM_CONT_OP:
 
-                bfa_pport_set_tx_bbcredit(fabric->fcs->bfa, fabric->bb_credit);
+                bfa_fcport_set_tx_bbcredit(fabric->fcs->bfa, fabric->bb_credit);
                 fabric->fab_type = BFA_FCS_FABRIC_SWITCHED;
 
                 if (fabric->auth_reqd && fabric->is_auth) {
@@ -252,7 +251,7 @@ bfa_fcs_fabric_sm_flogi(struct bfa_fcs_fabric_s *fabric,
 
         case BFA_FCS_FABRIC_SM_NO_FABRIC:
                 fabric->fab_type = BFA_FCS_FABRIC_N2N;
-                bfa_pport_set_tx_bbcredit(fabric->fcs->bfa, fabric->bb_credit);
+                bfa_fcport_set_tx_bbcredit(fabric->fcs->bfa, fabric->bb_credit);
                 bfa_fcs_fabric_notify_online(fabric);
                 bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_nofabric);
                 break;
@@ -419,7 +418,7 @@ bfa_fcs_fabric_sm_nofabric(struct bfa_fcs_fabric_s *fabric,
 
         case BFA_FCS_FABRIC_SM_NO_FABRIC:
                 bfa_trc(fabric->fcs, fabric->bb_credit);
-                bfa_pport_set_tx_bbcredit(fabric->fcs->bfa, fabric->bb_credit);
+                bfa_fcport_set_tx_bbcredit(fabric->fcs->bfa, fabric->bb_credit);
                 break;
 
         default:
@@ -563,17 +562,15 @@ void
 bfa_fcs_fabric_psymb_init(struct bfa_fcs_fabric_s *fabric)
 {
         struct bfa_port_cfg_s *port_cfg = &fabric->bport.port_cfg;
-        struct bfa_adapter_attr_s adapter_attr;
+        char            model[BFA_ADAPTER_MODEL_NAME_LEN] = {0};
         struct bfa_fcs_driver_info_s *driver_info = &fabric->fcs->driver_info;
 
-        bfa_os_memset((void *)&adapter_attr, 0,
-                      sizeof(struct bfa_adapter_attr_s));
-        bfa_ioc_get_adapter_attr(&fabric->fcs->bfa->ioc, &adapter_attr);
+        bfa_ioc_get_adapter_model(&fabric->fcs->bfa->ioc, model);
 
         /*
          * Model name/number
          */
-        strncpy((char *)&port_cfg->sym_name, adapter_attr.model,
+        strncpy((char *)&port_cfg->sym_name, model,
                 BFA_FCS_PORT_SYMBNAME_MODEL_SZ);
         strncat((char *)&port_cfg->sym_name, BFA_FCS_PORT_SYMBNAME_SEPARATOR,
                 sizeof(BFA_FCS_PORT_SYMBNAME_SEPARATOR));
@@ -719,10 +716,10 @@ bfa_fcs_fabric_login(struct bfa_fcs_fabric_s *fabric)
         struct bfa_port_cfg_s *pcfg = &fabric->bport.port_cfg;
         u8         alpa = 0;
 
-        if (bfa_pport_get_topology(bfa) == BFA_PPORT_TOPOLOGY_LOOP)
-                alpa = bfa_pport_get_myalpa(bfa);
+        if (bfa_fcport_get_topology(bfa) == BFA_PPORT_TOPOLOGY_LOOP)
+                alpa = bfa_fcport_get_myalpa(bfa);
 
-        bfa_lps_flogi(fabric->lps, fabric, alpa, bfa_pport_get_maxfrsize(bfa),
+        bfa_lps_flogi(fabric->lps, fabric, alpa, bfa_fcport_get_maxfrsize(bfa),
                       pcfg->pwwn, pcfg->nwwn, fabric->auth_reqd);
 
         fabric->stats.flogi_sent++;
@@ -814,10 +811,10 @@ bfa_fcs_fabric_delete_comp(void *cbarg)
  */
 
 /**
- *   Module initialization
+ *   Attach time initialization
  */
 void
-bfa_fcs_fabric_modinit(struct bfa_fcs_s *fcs)
+bfa_fcs_fabric_attach(struct bfa_fcs_s *fcs)
 {
         struct bfa_fcs_fabric_s *fabric;
 
@@ -841,7 +838,13 @@ bfa_fcs_fabric_modinit(struct bfa_fcs_s *fcs)
         bfa_wc_up(&fabric->wc); /* For the base port */
 
         bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_uninit);
-        bfa_sm_send_event(fabric, BFA_FCS_FABRIC_SM_CREATE);
+        bfa_fcs_lport_attach(&fabric->bport, fabric->fcs, FC_VF_ID_NULL, NULL);
+}
+
+void
+bfa_fcs_fabric_modinit(struct bfa_fcs_s *fcs)
+{
+        bfa_sm_send_event(&fcs->fabric, BFA_FCS_FABRIC_SM_CREATE);
         bfa_trc(fcs, 0);
 }
 
@@ -890,6 +893,12 @@ bfa_fcs_fabric_is_loopback(struct bfa_fcs_fabric_s *fabric)
         return bfa_sm_cmp_state(fabric, bfa_fcs_fabric_sm_loopback);
 }
 
+bfa_boolean_t
+bfa_fcs_fabric_is_auth_failed(struct bfa_fcs_fabric_s *fabric)
+{
+        return bfa_sm_cmp_state(fabric, bfa_fcs_fabric_sm_auth_failed);
+}
+
 enum bfa_pport_type
 bfa_fcs_fabric_port_type(struct bfa_fcs_fabric_s *fabric)
 {
@@ -1165,8 +1174,8 @@ bfa_fcs_fabric_send_flogi_acc(struct bfa_fcs_fabric_s *fabric)
         reqlen = fc_flogi_acc_build(&fchs, bfa_fcxp_get_reqbuf(fcxp),
                                     bfa_os_hton3b(FC_FABRIC_PORT),
                                     n2n_port->reply_oxid, pcfg->pwwn,
-                                    pcfg->nwwn, bfa_pport_get_maxfrsize(bfa),
-                                    bfa_pport_get_rx_bbcredit(bfa));
+                                    pcfg->nwwn, bfa_fcport_get_maxfrsize(bfa),
+                                    bfa_fcport_get_rx_bbcredit(bfa));
 
         bfa_fcxp_send(fcxp, NULL, fabric->vf_id, bfa_lps_get_tag(fabric->lps),
                         BFA_FALSE, FC_CLASS_3, reqlen, &fchs,
@@ -1224,14 +1233,8 @@ bfa_fcs_fabric_aen_post(struct bfa_fcs_port_s *port,
         wwn2str(pwwn_ptr, pwwn);
         wwn2str(fwwn_ptr, fwwn);
 
-        switch (event) {
-        case BFA_PORT_AEN_FABRIC_NAME_CHANGE:
-                bfa_log(logmod, BFA_AEN_PORT_FABRIC_NAME_CHANGE, pwwn_ptr,
-                        fwwn_ptr);
-                break;
-        default:
-                break;
-        }
+        bfa_log(logmod, BFA_LOG_CREATE_ID(BFA_AEN_CAT_PORT, event),
+                pwwn_ptr, fwwn_ptr);
 
         aen_data.port.pwwn = pwwn;
         aen_data.port.fwwn = fwwn;