Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / drivers / scsi / scsi_sas_internal.h

diff --git a/drivers/scsi/scsi_sas_internal.h b/drivers/scsi/scsi_sas_internal.h
index d76e6e3..e1edab4 100644 (file)
--- a/drivers/scsi/scsi_sas_internal.h
+++ b/drivers/scsi/scsi_sas_internal.h
@@ -2,7 +2,8 @@
 #define _SCSI_SAS_INTERNAL_H
 
 #define SAS_HOST_ATTRS         0
-#define SAS_PORT_ATTRS         17
+#define SAS_PHY_ATTRS          17
+#define SAS_PORT_ATTRS         1
 #define SAS_RPORT_ATTRS                7
 #define SAS_END_DEV_ATTRS      3
 #define SAS_EXPANDER_ATTRS     7
@@ -13,12 +14,14 @@ struct sas_internal {
        struct sas_domain_function_template *dft;
 
        struct class_device_attribute private_host_attrs[SAS_HOST_ATTRS];
-       struct class_device_attribute private_phy_attrs[SAS_PORT_ATTRS];
+       struct class_device_attribute private_phy_attrs[SAS_PHY_ATTRS];
+       struct class_device_attribute private_port_attrs[SAS_PORT_ATTRS];
        struct class_device_attribute private_rphy_attrs[SAS_RPORT_ATTRS];
        struct class_device_attribute private_end_dev_attrs[SAS_END_DEV_ATTRS];
        struct class_device_attribute private_expander_attrs[SAS_EXPANDER_ATTRS];
 
        struct transport_container phy_attr_cont;
+       struct transport_container port_attr_cont;
        struct transport_container rphy_attr_cont;
        struct transport_container end_dev_attr_cont;
        struct transport_container expander_attr_cont;
@@ -28,7 +31,8 @@ struct sas_internal {
         * needed by scsi_sysfs.c
         */
        struct class_device_attribute *host_attrs[SAS_HOST_ATTRS + 1];
-       struct class_device_attribute *phy_attrs[SAS_PORT_ATTRS + 1];
+       struct class_device_attribute *phy_attrs[SAS_PHY_ATTRS + 1];
+       struct class_device_attribute *port_attrs[SAS_PORT_ATTRS + 1];
        struct class_device_attribute *rphy_attrs[SAS_RPORT_ATTRS + 1];
        struct class_device_attribute *end_dev_attrs[SAS_END_DEV_ATTRS + 1];
        struct class_device_attribute *expander_attrs[SAS_EXPANDER_ATTRS + 1];