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: (34 commits)
  [SCSI] qla2xxx: Fix NULL ptr deref bug in fail path during queue create
  [SCSI] st: fix possible memory use after free after MTSETBLK ioctl
  [SCSI] be2iscsi: Moving to pci_pools v3
  [SCSI] libiscsi: iscsi_session_setup to allow for private space
  [SCSI] be2iscsi: add 10Gbps iSCSI - BladeEngine 2 driver
  [SCSI] zfcp: Fix hang when offlining device with offline chpid
  [SCSI] zfcp: Fix lockdep warning when offlining device with offline chpid
  [SCSI] zfcp: Fix oops during shutdown of offline device
  [SCSI] zfcp: Fix initial device and cfdc for delayed adapter allocation
  [SCSI] zfcp: correctly initialize unchained requests
  [SCSI] mpt2sas: Bump version 02.100.03.00
  [SCSI] mpt2sas: Support dev remove when phy status is MPI2_EVENT_SAS_TOPO_PHYSTATUS_VACANT
  [SCSI] mpt2sas: Timeout occurred within the HANDSHAKE logic while waiting on firmware to ACK.
  [SCSI] mpt2sas: Call init_completion on a per request basis.
  [SCSI] mpt2sas: Target Reset will be issued from Interrupt context.
  [SCSI] mpt2sas: Added SCSIIO, Internal and high priority memory pools to support multiple TM
  [SCSI] mpt2sas: Copyright change to 2009.
  [SCSI] mpt2sas: Added mpi2_history.txt for MPI2 headers.
  [SCSI] mpt2sas: Update driver to MPI2 REV K headers.
  [SCSI] bfa: Brocade BFA FC SCSI driver
  ...

1 files changed, 105 insertions, 0 deletions

diff --git a/drivers/scsi/bfa/n2n.c b/drivers/scsi/bfa/n2n.c
new file mode 100644
index 000000000000..735456824346
--- /dev/null
+++ b/drivers/scsi/bfa/n2n.c
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2005-2009 Brocade Communications Systems, Inc.
+ * All rights reserved
+ * www.brocade.com
+ *
+ * Linux driver for Brocade Fibre Channel Host Bus Adapter.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License (GPL) Version 2 as
+ * published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+
+/**
+ *  n2n.c n2n implementation.
+ */
+#include <bfa.h>
+#include <bfa_svc.h>
+#include "fcs_lport.h"
+#include "fcs_rport.h"
+#include "fcs_trcmod.h"
+#include "lport_priv.h"
+
+BFA_TRC_FILE(FCS, N2N);
+
+/**
+ *   Called by fcs/port to initialize N2N topology.
+ */
+void
+bfa_fcs_port_n2n_init(struct bfa_fcs_port_s *port)
+{
+}
+
+/**
+ *   Called by fcs/port to notify transition to online state.
+ */
+void
+bfa_fcs_port_n2n_online(struct bfa_fcs_port_s *port)
+{
+        struct bfa_fcs_port_n2n_s *n2n_port = &port->port_topo.pn2n;
+        struct bfa_port_cfg_s *pcfg = &port->port_cfg;
+        struct bfa_fcs_rport_s *rport;
+
+        bfa_trc(port->fcs, pcfg->pwwn);
+
+        /*
+         * If our PWWN is > than that of the r-port, we have to initiate PLOGI
+         * and assign an Address. if not, we need to wait for its PLOGI.
+         *
+         * If our PWWN is < than that of the remote port, it will send a PLOGI
+         * with the PIDs assigned. The rport state machine take care of this
+         * incoming PLOGI.
+         */
+        if (memcmp
+            ((void *)&pcfg->pwwn, (void *)&n2n_port->rem_port_wwn,
+             sizeof(wwn_t)) > 0) {
+                port->pid = N2N_LOCAL_PID;
+                /**
+                 * First, check if we know the device by pwwn.
+                 */
+                rport = bfa_fcs_port_get_rport_by_pwwn(port,
+                                                       n2n_port->rem_port_wwn);
+                if (rport) {
+                        bfa_trc(port->fcs, rport->pid);
+                        bfa_trc(port->fcs, rport->pwwn);
+                        rport->pid = N2N_REMOTE_PID;
+                        bfa_fcs_rport_online(rport);
+                        return;
+                }
+
+                /*
+                 * In n2n there can be only one rport. Delete the old one whose
+                 * pid should be zero, because it is offline.
+                 */
+                if (port->num_rports > 0) {
+                        rport = bfa_fcs_port_get_rport_by_pid(port, 0);
+                        bfa_assert(rport != NULL);
+                        if (rport) {
+                                bfa_trc(port->fcs, rport->pwwn);
+                                bfa_fcs_rport_delete(rport);
+                        }
+                }
+                bfa_fcs_rport_create(port, N2N_REMOTE_PID);
+        }
+}
+
+/**
+ *   Called by fcs/port to notify transition to offline state.
+ */
+void
+bfa_fcs_port_n2n_offline(struct bfa_fcs_port_s *port)
+{
+        struct bfa_fcs_port_n2n_s *n2n_port = &port->port_topo.pn2n;
+
+        bfa_trc(port->fcs, port->pid);
+        port->pid = 0;
+        n2n_port->rem_port_wwn = 0;
+        n2n_port->reply_oxid = 0;
+}
+
+