rapidio/tsi721: modify mport name assignment

[sfrench/cifs-2.6.git] / include / linux / rio.h

diff --git a/include/linux/rio.h b/include/linux/rio.h
index a90ebadd9da055bb5130782246872a0ef53d8438..1a7b6c7787a5136c0c5617758c9df71ac0ceaee7 100644 (file)
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -30,6 +30,7 @@
 #define RIO_MAX_MPORTS         8
 #define RIO_MAX_MPORT_RESOURCES        16
 #define RIO_MAX_DEV_RESOURCES  16
+#define RIO_MAX_MPORT_NAME     40
 
 #define RIO_GLOBAL_TABLE       0xff    /* Indicates access of a switch's
                                           global routing table if it
@@ -255,7 +256,7 @@ struct rio_mport {
                                 */
        enum rio_phy_type phy_type;     /* RapidIO phy type */
        u32 phys_efptr;
-       unsigned char name[40];
+       unsigned char name[RIO_MAX_MPORT_NAME];
        void *priv;             /* Master port private data */
 #ifdef CONFIG_RAPIDIO_DMA_ENGINE
        struct dma_device       dma;