fore2000 - fix misannotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
author: Al Viro <viro@ftp.linux.org.uk> 2008-03-16 18:23:04 -0400
committer: Jeff Garzik <jeff@garzik.org> 2008-03-17 07:56:31 -0400
commit: 63734a32a401d79eb1ae54bf61374a54c05750c9 (patch)
tree: 502c30594a23cbad7ab0bc603daa690b6c6de9fd
parent: 5ffa6d7f613ca0198dae235986443cd921fa2e75 (diff)
2 files changed, 108 insertions, 108 deletions
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 9427a61f62b0..432181ed7bb5 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -1988,19 +1988,19 @@ fore200e_fetch_stats(struct fore200e* fore200e, struct sonet_stats __user *arg)
    if (fore200e_getstats(fore200e) < 0)
        return -EIO;
-    tmp.section_bip = cpu_to_be32(fore200e->stats->oc3.section_bip8_errors);
+    tmp.section_bip = be32_to_cpu(fore200e->stats->oc3.section_bip8_errors);
-    tmp.line_bip    = cpu_to_be32(fore200e->stats->oc3.line_bip24_errors);
+    tmp.line_bip    = be32_to_cpu(fore200e->stats->oc3.line_bip24_errors);
-    tmp.path_bip    = cpu_to_be32(fore200e->stats->oc3.path_bip8_errors);
+    tmp.path_bip    = be32_to_cpu(fore200e->stats->oc3.path_bip8_errors);
-    tmp.line_febe   = cpu_to_be32(fore200e->stats->oc3.line_febe_errors);
+    tmp.line_febe   = be32_to_cpu(fore200e->stats->oc3.line_febe_errors);
-    tmp.path_febe   = cpu_to_be32(fore200e->stats->oc3.path_febe_errors);
+    tmp.path_febe   = be32_to_cpu(fore200e->stats->oc3.path_febe_errors);
-    tmp.corr_hcs    = cpu_to_be32(fore200e->stats->oc3.corr_hcs_errors);
+    tmp.corr_hcs    = be32_to_cpu(fore200e->stats->oc3.corr_hcs_errors);
-    tmp.uncorr_hcs  = cpu_to_be32(fore200e->stats->oc3.ucorr_hcs_errors);
+    tmp.uncorr_hcs  = be32_to_cpu(fore200e->stats->oc3.ucorr_hcs_errors);
-    tmp.tx_cells    = cpu_to_be32(fore200e->stats->aal0.cells_transmitted)  +
+    tmp.tx_cells    = be32_to_cpu(fore200e->stats->aal0.cells_transmitted)  +
-                      cpu_to_be32(fore200e->stats->aal34.cells_transmitted) +
+                      be32_to_cpu(fore200e->stats->aal34.cells_transmitted) +
-                      cpu_to_be32(fore200e->stats->aal5.cells_transmitted);
+                      be32_to_cpu(fore200e->stats->aal5.cells_transmitted);
-    tmp.rx_cells    = cpu_to_be32(fore200e->stats->aal0.cells_received)     +
+    tmp.rx_cells    = be32_to_cpu(fore200e->stats->aal0.cells_received)     +
-                      cpu_to_be32(fore200e->stats->aal34.cells_received)    +
+                      be32_to_cpu(fore200e->stats->aal34.cells_received)    +
-                      cpu_to_be32(fore200e->stats->aal5.cells_received);
+                      be32_to_cpu(fore200e->stats->aal5.cells_received);
    if (arg)
        return copy_to_user(arg, &tmp, sizeof(struct sonet_stats)) ? -EFAULT : 0;       
@@ -2587,7 +2587,7 @@ fore200e_start_fw(struct fore200e* fore200e)
 static int __devinit
 fore200e_load_fw(struct fore200e* fore200e)
 {
-    u32* fw_data = (u32*) fore200e->bus->fw_data;
+    __le32* fw_data = (__le32*) fore200e->bus->fw_data;
    u32  fw_size = (u32) *fore200e->bus->fw_size / sizeof(u32);
    struct fw_header* fw_header = (struct fw_header*) fw_data;
@@ -2965,8 +2965,8 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                       "  4b5b:\n"
                       "     crc_header_errors:\t\t%10u\n"
                       "     framing_errors:\t\t%10u\n",
-                       cpu_to_be32(fore200e->stats->phy.crc_header_errors),
+                       be32_to_cpu(fore200e->stats->phy.crc_header_errors),
-                       cpu_to_be32(fore200e->stats->phy.framing_errors));
+                       be32_to_cpu(fore200e->stats->phy.framing_errors));
    
    if (!left--)
        return sprintf(page, "\n"
@@ -2978,13 +2978,13 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                       "     path_febe_errors:\t\t%10u\n"
                       "     corr_hcs_errors:\t\t%10u\n"
                       "     ucorr_hcs_errors:\t\t%10u\n",
-                       cpu_to_be32(fore200e->stats->oc3.section_bip8_errors),
+                       be32_to_cpu(fore200e->stats->oc3.section_bip8_errors),
-                       cpu_to_be32(fore200e->stats->oc3.path_bip8_errors),
+                       be32_to_cpu(fore200e->stats->oc3.path_bip8_errors),
-                       cpu_to_be32(fore200e->stats->oc3.line_bip24_errors),
+                       be32_to_cpu(fore200e->stats->oc3.line_bip24_errors),
-                       cpu_to_be32(fore200e->stats->oc3.line_febe_errors),
+                       be32_to_cpu(fore200e->stats->oc3.line_febe_errors),
-                       cpu_to_be32(fore200e->stats->oc3.path_febe_errors),
+                       be32_to_cpu(fore200e->stats->oc3.path_febe_errors),
-                       cpu_to_be32(fore200e->stats->oc3.corr_hcs_errors),
+                       be32_to_cpu(fore200e->stats->oc3.corr_hcs_errors),
-                       cpu_to_be32(fore200e->stats->oc3.ucorr_hcs_errors));
+                       be32_to_cpu(fore200e->stats->oc3.ucorr_hcs_errors));
    if (!left--)
        return sprintf(page,"\n"
@@ -2995,12 +2995,12 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                       "     vpi no conn:\t\t%10u\n"
                       "     vci out of range:\t\t%10u\n"
                       "     vci no conn:\t\t%10u\n",
-                       cpu_to_be32(fore200e->stats->atm.cells_transmitted),
+                       be32_to_cpu(fore200e->stats->atm.cells_transmitted),
-                       cpu_to_be32(fore200e->stats->atm.cells_received),
+                       be32_to_cpu(fore200e->stats->atm.cells_received),
-                       cpu_to_be32(fore200e->stats->atm.vpi_bad_range),
+                       be32_to_cpu(fore200e->stats->atm.vpi_bad_range),
-                       cpu_to_be32(fore200e->stats->atm.vpi_no_conn),
+                       be32_to_cpu(fore200e->stats->atm.vpi_no_conn),
-                       cpu_to_be32(fore200e->stats->atm.vci_bad_range),
+                       be32_to_cpu(fore200e->stats->atm.vci_bad_range),
-                       cpu_to_be32(fore200e->stats->atm.vci_no_conn));
+                       be32_to_cpu(fore200e->stats->atm.vci_no_conn));
    
    if (!left--)
        return sprintf(page,"\n"
@@ -3008,9 +3008,9 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                       "     TX:\t\t\t%10u\n"
                       "     RX:\t\t\t%10u\n"
                       "     dropped:\t\t\t%10u\n",
-                       cpu_to_be32(fore200e->stats->aal0.cells_transmitted),
+                       be32_to_cpu(fore200e->stats->aal0.cells_transmitted),
-                       cpu_to_be32(fore200e->stats->aal0.cells_received),
+                       be32_to_cpu(fore200e->stats->aal0.cells_received),
-                       cpu_to_be32(fore200e->stats->aal0.cells_dropped));
+                       be32_to_cpu(fore200e->stats->aal0.cells_dropped));
    
    if (!left--)
        return sprintf(page,"\n"
@@ -3026,15 +3026,15 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                       "       RX:\t\t\t%10u\n"
                       "       dropped:\t\t\t%10u\n"
                       "       protocol errors:\t\t%10u\n",
-                       cpu_to_be32(fore200e->stats->aal34.cells_transmitted),
+                       be32_to_cpu(fore200e->stats->aal34.cells_transmitted),
-                       cpu_to_be32(fore200e->stats->aal34.cells_received),
+                       be32_to_cpu(fore200e->stats->aal34.cells_received),
-                       cpu_to_be32(fore200e->stats->aal34.cells_dropped),
+                       be32_to_cpu(fore200e->stats->aal34.cells_dropped),
-                       cpu_to_be32(fore200e->stats->aal34.cells_crc_errors),
+                       be32_to_cpu(fore200e->stats->aal34.cells_crc_errors),
-                       cpu_to_be32(fore200e->stats->aal34.cells_protocol_errors),
+                       be32_to_cpu(fore200e->stats->aal34.cells_protocol_errors),
-                       cpu_to_be32(fore200e->stats->aal34.cspdus_transmitted),
+                       be32_to_cpu(fore200e->stats->aal34.cspdus_transmitted),
-                       cpu_to_be32(fore200e->stats->aal34.cspdus_received),
+                       be32_to_cpu(fore200e->stats->aal34.cspdus_received),
-                       cpu_to_be32(fore200e->stats->aal34.cspdus_dropped),
+                       be32_to_cpu(fore200e->stats->aal34.cspdus_dropped),
-                       cpu_to_be32(fore200e->stats->aal34.cspdus_protocol_errors));
+                       be32_to_cpu(fore200e->stats->aal34.cspdus_protocol_errors));
    
    if (!left--)
        return sprintf(page,"\n"
@@ -3050,15 +3050,15 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                       "       dropped:\t\t\t%10u\n"
                       "       CRC errors:\t\t%10u\n"
                       "       protocol errors:\t\t%10u\n",
-                       cpu_to_be32(fore200e->stats->aal5.cells_transmitted),
+                       be32_to_cpu(fore200e->stats->aal5.cells_transmitted),
-                       cpu_to_be32(fore200e->stats->aal5.cells_received),
+                       be32_to_cpu(fore200e->stats->aal5.cells_received),
-                       cpu_to_be32(fore200e->stats->aal5.cells_dropped),
+                       be32_to_cpu(fore200e->stats->aal5.cells_dropped),
-                       cpu_to_be32(fore200e->stats->aal5.congestion_experienced),
+                       be32_to_cpu(fore200e->stats->aal5.congestion_experienced),
-                       cpu_to_be32(fore200e->stats->aal5.cspdus_transmitted),
+                       be32_to_cpu(fore200e->stats->aal5.cspdus_transmitted),
-                       cpu_to_be32(fore200e->stats->aal5.cspdus_received),
+                       be32_to_cpu(fore200e->stats->aal5.cspdus_received),
-                       cpu_to_be32(fore200e->stats->aal5.cspdus_dropped),
+                       be32_to_cpu(fore200e->stats->aal5.cspdus_dropped),
-                       cpu_to_be32(fore200e->stats->aal5.cspdus_crc_errors),
+                       be32_to_cpu(fore200e->stats->aal5.cspdus_crc_errors),
-                       cpu_to_be32(fore200e->stats->aal5.cspdus_protocol_errors));
+                       be32_to_cpu(fore200e->stats->aal5.cspdus_protocol_errors));
    
    if (!left--)
        return sprintf(page,"\n"
@@ -3069,11 +3069,11 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
                       "     large b2:\t\t\t%10u\n"
                       "     RX PDUs:\t\t\t%10u\n"
                       "     TX PDUs:\t\t\t%10lu\n",
-                       cpu_to_be32(fore200e->stats->aux.small_b1_failed),
+                       be32_to_cpu(fore200e->stats->aux.small_b1_failed),
-                       cpu_to_be32(fore200e->stats->aux.large_b1_failed),
+                       be32_to_cpu(fore200e->stats->aux.large_b1_failed),
-                       cpu_to_be32(fore200e->stats->aux.small_b2_failed),
+                       be32_to_cpu(fore200e->stats->aux.small_b2_failed),
-                       cpu_to_be32(fore200e->stats->aux.large_b2_failed),
+                       be32_to_cpu(fore200e->stats->aux.large_b2_failed),
-                       cpu_to_be32(fore200e->stats->aux.rpd_alloc_failed),
+                       be32_to_cpu(fore200e->stats->aux.rpd_alloc_failed),
                       fore200e->tx_sat);
    
    if (!left--)
diff --git a/drivers/atm/fore200e.h b/drivers/atm/fore200e.h
index b85a54613dea..183841cc8fdf 100644
--- a/drivers/atm/fore200e.h
+++ b/drivers/atm/fore200e.h
@@ -349,90 +349,90 @@ typedef struct oc3_block {
 /* physical encoding statistics */
 typedef struct stats_phy {
-    u32 crc_header_errors;    /* cells received with bad header CRC */
+    __be32 crc_header_errors;    /* cells received with bad header CRC */
-    u32 framing_errors;       /* cells received with bad framing    */
+    __be32 framing_errors;       /* cells received with bad framing    */
-    u32 pad[ 2 ];             /* i960 padding                       */
+    __be32 pad[ 2 ];             /* i960 padding                       */
 } stats_phy_t;
 /* OC-3 statistics */
 typedef struct stats_oc3 {
-    u32 section_bip8_errors;    /* section 8 bit interleaved parity    */
+    __be32 section_bip8_errors;    /* section 8 bit interleaved parity    */
-    u32 path_bip8_errors;       /* path 8 bit interleaved parity       */
+    __be32 path_bip8_errors;       /* path 8 bit interleaved parity       */
-    u32 line_bip24_errors;      /* line 24 bit interleaved parity      */
+    __be32 line_bip24_errors;      /* line 24 bit interleaved parity      */
-    u32 line_febe_errors;       /* line far end block errors           */
+    __be32 line_febe_errors;       /* line far end block errors           */
-    u32 path_febe_errors;       /* path far end block errors           */
+    __be32 path_febe_errors;       /* path far end block errors           */
-    u32 corr_hcs_errors;        /* correctable header check sequence   */
+    __be32 corr_hcs_errors;        /* correctable header check sequence   */
-    u32 ucorr_hcs_errors;       /* uncorrectable header check sequence */
+    __be32 ucorr_hcs_errors;       /* uncorrectable header check sequence */
-    u32 pad[ 1 ];               /* i960 padding                        */
+    __be32 pad[ 1 ];               /* i960 padding                        */
 } stats_oc3_t;
 /* ATM statistics */
 typedef struct stats_atm {
-    u32 cells_transmitted;    /* cells transmitted                 */
+    __be32      cells_transmitted;    /* cells transmitted                 */
-    u32 cells_received;       /* cells received                    */
+    __be32      cells_received;       /* cells received                    */
-    u32 vpi_bad_range;        /* cell drops: VPI out of range      */
+    __be32      vpi_bad_range;        /* cell drops: VPI out of range      */
-    u32 vpi_no_conn;          /* cell drops: no connection for VPI */
+    __be32      vpi_no_conn;          /* cell drops: no connection for VPI */
-    u32 vci_bad_range;        /* cell drops: VCI out of range      */
+    __be32      vci_bad_range;        /* cell drops: VCI out of range      */
-    u32 vci_no_conn;          /* cell drops: no connection for VCI */
+    __be32      vci_no_conn;          /* cell drops: no connection for VCI */
-    u32 pad[ 2 ];             /* i960 padding                      */
+    __be32      pad[ 2 ];             /* i960 padding                      */
 } stats_atm_t;
 /* AAL0 statistics */
 typedef struct stats_aal0 {
-    u32 cells_transmitted;    /* cells transmitted */
+    __be32      cells_transmitted;    /* cells transmitted */
-    u32 cells_received;       /* cells received    */
+    __be32      cells_received;       /* cells received    */
-    u32 cells_dropped;        /* cells dropped     */
+    __be32      cells_dropped;        /* cells dropped     */
-    u32 pad[ 1 ];             /* i960 padding      */
+    __be32      pad[ 1 ];             /* i960 padding      */
 } stats_aal0_t;
 /* AAL3/4 statistics */
 typedef struct stats_aal34 {
-    u32 cells_transmitted;         /* cells transmitted from segmented PDUs */
+    __be32      cells_transmitted;         /* cells transmitted from segmented PDUs */
-    u32 cells_received;            /* cells reassembled into PDUs           */
+    __be32      cells_received;            /* cells reassembled into PDUs           */
-    u32 cells_crc_errors;          /* payload CRC error count               */
+    __be32      cells_crc_errors;          /* payload CRC error count               */
-    u32 cells_protocol_errors;     /* SAR or CS layer protocol errors       */
+    __be32      cells_protocol_errors;     /* SAR or CS layer protocol errors       */
-    u32 cells_dropped;             /* cells dropped: partial reassembly     */
+    __be32      cells_dropped;             /* cells dropped: partial reassembly     */
-    u32 cspdus_transmitted;        /* CS PDUs transmitted                   */
+    __be32      cspdus_transmitted;        /* CS PDUs transmitted                   */
-    u32 cspdus_received;           /* CS PDUs received                      */
+    __be32      cspdus_received;           /* CS PDUs received                      */
-    u32 cspdus_protocol_errors;    /* CS layer protocol errors              */
+    __be32      cspdus_protocol_errors;    /* CS layer protocol errors              */
-    u32 cspdus_dropped;            /* reassembled PDUs drop'd (in cells)    */
+    __be32      cspdus_dropped;            /* reassembled PDUs drop'd (in cells)    */
-    u32 pad[ 3 ];                  /* i960 padding                          */
+    __be32      pad[ 3 ];                  /* i960 padding                          */
 } stats_aal34_t;
 /* AAL5 statistics */
 typedef struct stats_aal5 {
-    u32 cells_transmitted;         /* cells transmitted from segmented SDUs */
+    __be32      cells_transmitted;         /* cells transmitted from segmented SDUs */
-    u32 cells_received;            /* cells reassembled into SDUs           */
+    __be32      cells_received;            /* cells reassembled into SDUs           */
-    u32 cells_dropped;             /* reassembled PDUs dropped (in cells)   */
+    __be32      cells_dropped;             /* reassembled PDUs dropped (in cells)   */
-    u32 congestion_experienced;    /* CRC error and length wrong            */
+    __be32      congestion_experienced;    /* CRC error and length wrong            */
-    u32 cspdus_transmitted;        /* CS PDUs transmitted                   */
+    __be32      cspdus_transmitted;        /* CS PDUs transmitted                   */
-    u32 cspdus_received;           /* CS PDUs received                      */
+    __be32      cspdus_received;           /* CS PDUs received                      */
-    u32 cspdus_crc_errors;         /* CS PDUs CRC errors                    */
+    __be32      cspdus_crc_errors;         /* CS PDUs CRC errors                    */
-    u32 cspdus_protocol_errors;    /* CS layer protocol errors              */
+    __be32      cspdus_protocol_errors;    /* CS layer protocol errors              */
-    u32 cspdus_dropped;            /* reassembled PDUs dropped              */
+    __be32      cspdus_dropped;            /* reassembled PDUs dropped              */
-    u32 pad[ 3 ];                  /* i960 padding                          */
+    __be32      pad[ 3 ];                  /* i960 padding                          */
 } stats_aal5_t;
 /* auxiliary statistics */
 typedef struct stats_aux {
-    u32 small_b1_failed;     /* receive BD allocation failures  */
+    __be32      small_b1_failed;     /* receive BD allocation failures  */
-    u32 large_b1_failed;     /* receive BD allocation failures  */
+    __be32      large_b1_failed;     /* receive BD allocation failures  */
-    u32 small_b2_failed;     /* receive BD allocation failures  */
+    __be32      small_b2_failed;     /* receive BD allocation failures  */
-    u32 large_b2_failed;     /* receive BD allocation failures  */
+    __be32      large_b2_failed;     /* receive BD allocation failures  */
-    u32 rpd_alloc_failed;    /* receive PDU allocation failures */
+    __be32      rpd_alloc_failed;    /* receive PDU allocation failures */
-    u32 receive_carrier;     /* no carrier = 0, carrier = 1     */
+    __be32      receive_carrier;     /* no carrier = 0, carrier = 1     */
-    u32 pad[ 2 ];            /* i960 padding                    */
+    __be32      pad[ 2 ];            /* i960 padding                    */
 } stats_aux_t;
@@ -643,10 +643,10 @@ typedef struct host_bsq {
 /* header of the firmware image */
 typedef struct fw_header {
-    u32 magic;           /* magic number                               */
+    __le32 magic;           /* magic number                               */
-    u32 version;         /* firmware version id                        */
+    __le32 version;         /* firmware version id                        */
-    u32 load_offset;     /* fw load offset in board memory             */
+    __le32 load_offset;     /* fw load offset in board memory             */
-    u32 start_offset;    /* fw execution start address in board memory */
+    __le32 start_offset;    /* fw execution start address in board memory */
 } fw_header_t;
 #define FW_HEADER_MAGIC  0x65726f66    /* 'fore' */
author	Al Viro <viro@ftp.linux.org.uk>	2008-03-16 18:23:04 -0400
committer	Jeff Garzik <jeff@garzik.org>	2008-03-17 07:56:31 -0400
commit	63734a32a401d79eb1ae54bf61374a54c05750c9 (patch)
tree	502c30594a23cbad7ab0bc603daa690b6c6de9fd
parent	5ffa6d7f613ca0198dae235986443cd921fa2e75 (diff)

diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c index 9427a61f62b0..432181ed7bb5 100644 --- a/drivers/atm/fore200e.c +++ b/drivers/atm/fore200e.c
@@ -1988,19 +1988,19 @@ fore200e_fetch_stats(struct fore200e* fore200e, struct sonet_stats __user *arg)
1988	if (fore200e_getstats(fore200e) < 0)	1988	if (fore200e_getstats(fore200e) < 0)
1989	return -EIO;	1989	return -EIO;
1990		1990
1991	tmp.section_bip = cpu_to_be32(fore200e->stats->oc3.section_bip8_errors);	1991	tmp.section_bip = be32_to_cpu(fore200e->stats->oc3.section_bip8_errors);
1992	tmp.line_bip = cpu_to_be32(fore200e->stats->oc3.line_bip24_errors);	1992	tmp.line_bip = be32_to_cpu(fore200e->stats->oc3.line_bip24_errors);
1993	tmp.path_bip = cpu_to_be32(fore200e->stats->oc3.path_bip8_errors);	1993	tmp.path_bip = be32_to_cpu(fore200e->stats->oc3.path_bip8_errors);
1994	tmp.line_febe = cpu_to_be32(fore200e->stats->oc3.line_febe_errors);	1994	tmp.line_febe = be32_to_cpu(fore200e->stats->oc3.line_febe_errors);
1995	tmp.path_febe = cpu_to_be32(fore200e->stats->oc3.path_febe_errors);	1995	tmp.path_febe = be32_to_cpu(fore200e->stats->oc3.path_febe_errors);
1996	tmp.corr_hcs = cpu_to_be32(fore200e->stats->oc3.corr_hcs_errors);	1996	tmp.corr_hcs = be32_to_cpu(fore200e->stats->oc3.corr_hcs_errors);
1997	tmp.uncorr_hcs = cpu_to_be32(fore200e->stats->oc3.ucorr_hcs_errors);	1997	tmp.uncorr_hcs = be32_to_cpu(fore200e->stats->oc3.ucorr_hcs_errors);
1998	tmp.tx_cells = cpu_to_be32(fore200e->stats->aal0.cells_transmitted) +	1998	tmp.tx_cells = be32_to_cpu(fore200e->stats->aal0.cells_transmitted) +
1999	cpu_to_be32(fore200e->stats->aal34.cells_transmitted) +	1999	be32_to_cpu(fore200e->stats->aal34.cells_transmitted) +
2000	cpu_to_be32(fore200e->stats->aal5.cells_transmitted);	2000	be32_to_cpu(fore200e->stats->aal5.cells_transmitted);
2001	tmp.rx_cells = cpu_to_be32(fore200e->stats->aal0.cells_received) +	2001	tmp.rx_cells = be32_to_cpu(fore200e->stats->aal0.cells_received) +
2002	cpu_to_be32(fore200e->stats->aal34.cells_received) +	2002	be32_to_cpu(fore200e->stats->aal34.cells_received) +
2003	cpu_to_be32(fore200e->stats->aal5.cells_received);	2003	be32_to_cpu(fore200e->stats->aal5.cells_received);
2004		2004
2005	if (arg)	2005	if (arg)
2006	return copy_to_user(arg, &tmp, sizeof(struct sonet_stats)) ? -EFAULT : 0;	2006	return copy_to_user(arg, &tmp, sizeof(struct sonet_stats)) ? -EFAULT : 0;
@@ -2587,7 +2587,7 @@ fore200e_start_fw(struct fore200e* fore200e)
2587	static int __devinit	2587	static int __devinit
2588	fore200e_load_fw(struct fore200e* fore200e)	2588	fore200e_load_fw(struct fore200e* fore200e)
2589	{	2589	{
2590	u32* fw_data = (u32*) fore200e->bus->fw_data;	2590	__le32* fw_data = (__le32*) fore200e->bus->fw_data;
2591	u32 fw_size = (u32) *fore200e->bus->fw_size / sizeof(u32);	2591	u32 fw_size = (u32) *fore200e->bus->fw_size / sizeof(u32);
2592		2592
2593	struct fw_header* fw_header = (struct fw_header*) fw_data;	2593	struct fw_header* fw_header = (struct fw_header*) fw_data;
@@ -2965,8 +2965,8 @@ fore200e_proc_read(struct atm_dev dev, loff_t pos, char* page)
2965	" 4b5b:\n"	2965	" 4b5b:\n"
2966	" crc_header_errors:\t\t%10u\n"	2966	" crc_header_errors:\t\t%10u\n"
2967	" framing_errors:\t\t%10u\n",	2967	" framing_errors:\t\t%10u\n",
2968	cpu_to_be32(fore200e->stats->phy.crc_header_errors),	2968	be32_to_cpu(fore200e->stats->phy.crc_header_errors),
2969	cpu_to_be32(fore200e->stats->phy.framing_errors));	2969	be32_to_cpu(fore200e->stats->phy.framing_errors));
2970		2970
2971	if (!left--)	2971	if (!left--)
2972	return sprintf(page, "\n"	2972	return sprintf(page, "\n"
@@ -2978,13 +2978,13 @@ fore200e_proc_read(struct atm_dev dev, loff_t pos, char* page)
2978	" path_febe_errors:\t\t%10u\n"	2978	" path_febe_errors:\t\t%10u\n"
2979	" corr_hcs_errors:\t\t%10u\n"	2979	" corr_hcs_errors:\t\t%10u\n"
2980	" ucorr_hcs_errors:\t\t%10u\n",	2980	" ucorr_hcs_errors:\t\t%10u\n",
2981	cpu_to_be32(fore200e->stats->oc3.section_bip8_errors),	2981	be32_to_cpu(fore200e->stats->oc3.section_bip8_errors),
2982	cpu_to_be32(fore200e->stats->oc3.path_bip8_errors),	2982	be32_to_cpu(fore200e->stats->oc3.path_bip8_errors),
2983	cpu_to_be32(fore200e->stats->oc3.line_bip24_errors),	2983	be32_to_cpu(fore200e->stats->oc3.line_bip24_errors),
2984	cpu_to_be32(fore200e->stats->oc3.line_febe_errors),	2984	be32_to_cpu(fore200e->stats->oc3.line_febe_errors),
2985	cpu_to_be32(fore200e->stats->oc3.path_febe_errors),	2985	be32_to_cpu(fore200e->stats->oc3.path_febe_errors),
2986	cpu_to_be32(fore200e->stats->oc3.corr_hcs_errors),	2986	be32_to_cpu(fore200e->stats->oc3.corr_hcs_errors),
2987	cpu_to_be32(fore200e->stats->oc3.ucorr_hcs_errors));	2987	be32_to_cpu(fore200e->stats->oc3.ucorr_hcs_errors));
2988		2988
2989	if (!left--)	2989	if (!left--)
2990	return sprintf(page,"\n"	2990	return sprintf(page,"\n"
@@ -2995,12 +2995,12 @@ fore200e_proc_read(struct atm_dev dev, loff_t pos, char* page)
2995	" vpi no conn:\t\t%10u\n"	2995	" vpi no conn:\t\t%10u\n"
2996	" vci out of range:\t\t%10u\n"	2996	" vci out of range:\t\t%10u\n"
2997	" vci no conn:\t\t%10u\n",	2997	" vci no conn:\t\t%10u\n",
2998	cpu_to_be32(fore200e->stats->atm.cells_transmitted),	2998	be32_to_cpu(fore200e->stats->atm.cells_transmitted),
2999	cpu_to_be32(fore200e->stats->atm.cells_received),	2999	be32_to_cpu(fore200e->stats->atm.cells_received),
3000	cpu_to_be32(fore200e->stats->atm.vpi_bad_range),	3000	be32_to_cpu(fore200e->stats->atm.vpi_bad_range),
3001	cpu_to_be32(fore200e->stats->atm.vpi_no_conn),	3001	be32_to_cpu(fore200e->stats->atm.vpi_no_conn),
3002	cpu_to_be32(fore200e->stats->atm.vci_bad_range),	3002	be32_to_cpu(fore200e->stats->atm.vci_bad_range),
3003	cpu_to_be32(fore200e->stats->atm.vci_no_conn));	3003	be32_to_cpu(fore200e->stats->atm.vci_no_conn));
3004		3004
3005	if (!left--)	3005	if (!left--)
3006	return sprintf(page,"\n"	3006	return sprintf(page,"\n"
@@ -3008,9 +3008,9 @@ fore200e_proc_read(struct atm_dev dev, loff_t pos, char* page)
3008	" TX:\t\t\t%10u\n"	3008	" TX:\t\t\t%10u\n"
3009	" RX:\t\t\t%10u\n"	3009	" RX:\t\t\t%10u\n"
3010	" dropped:\t\t\t%10u\n",	3010	" dropped:\t\t\t%10u\n",
3011	cpu_to_be32(fore200e->stats->aal0.cells_transmitted),	3011	be32_to_cpu(fore200e->stats->aal0.cells_transmitted),
3012	cpu_to_be32(fore200e->stats->aal0.cells_received),	3012	be32_to_cpu(fore200e->stats->aal0.cells_received),
3013	cpu_to_be32(fore200e->stats->aal0.cells_dropped));	3013	be32_to_cpu(fore200e->stats->aal0.cells_dropped));
3014		3014
3015	if (!left--)	3015	if (!left--)
3016	return sprintf(page,"\n"	3016	return sprintf(page,"\n"
@@ -3026,15 +3026,15 @@ fore200e_proc_read(struct atm_dev dev, loff_t pos, char* page)
3026	" RX:\t\t\t%10u\n"	3026	" RX:\t\t\t%10u\n"
3027	" dropped:\t\t\t%10u\n"	3027	" dropped:\t\t\t%10u\n"
3028	" protocol errors:\t\t%10u\n",	3028	" protocol errors:\t\t%10u\n",
3029	cpu_to_be32(fore200e->stats->aal34.cells_transmitted),	3029	be32_to_cpu(fore200e->stats->aal34.cells_transmitted),
3030	cpu_to_be32(fore200e->stats->aal34.cells_received),	3030	be32_to_cpu(fore200e->stats->aal34.cells_received),
3031	cpu_to_be32(fore200e->stats->aal34.cells_dropped),	3031	be32_to_cpu(fore200e->stats->aal34.cells_dropped),
3032	cpu_to_be32(fore200e->stats->aal34.cells_crc_errors),	3032	be32_to_cpu(fore200e->stats->aal34.cells_crc_errors),
3033	cpu_to_be32(fore200e->stats->aal34.cells_protocol_errors),	3033	be32_to_cpu(fore200e->stats->aal34.cells_protocol_errors),
3034	cpu_to_be32(fore200e->stats->aal34.cspdus_transmitted),	3034	be32_to_cpu(fore200e->stats->aal34.cspdus_transmitted),
3035	cpu_to_be32(fore200e->stats->aal34.cspdus_received),	3035	be32_to_cpu(fore200e->stats->aal34.cspdus_received),
3036	cpu_to_be32(fore200e->stats->aal34.cspdus_dropped),	3036	be32_to_cpu(fore200e->stats->aal34.cspdus_dropped),
3037	cpu_to_be32(fore200e->stats->aal34.cspdus_protocol_errors));	3037	be32_to_cpu(fore200e->stats->aal34.cspdus_protocol_errors));
3038		3038
3039	if (!left--)	3039	if (!left--)
3040	return sprintf(page,"\n"	3040	return sprintf(page,"\n"
@@ -3050,15 +3050,15 @@ fore200e_proc_read(struct atm_dev dev, loff_t pos, char* page)
3050	" dropped:\t\t\t%10u\n"	3050	" dropped:\t\t\t%10u\n"
3051	" CRC errors:\t\t%10u\n"	3051	" CRC errors:\t\t%10u\n"
3052	" protocol errors:\t\t%10u\n",	3052	" protocol errors:\t\t%10u\n",
3053	cpu_to_be32(fore200e->stats->aal5.cells_transmitted),	3053	be32_to_cpu(fore200e->stats->aal5.cells_transmitted),
3054	cpu_to_be32(fore200e->stats->aal5.cells_received),	3054	be32_to_cpu(fore200e->stats->aal5.cells_received),
3055	cpu_to_be32(fore200e->stats->aal5.cells_dropped),	3055	be32_to_cpu(fore200e->stats->aal5.cells_dropped),
3056	cpu_to_be32(fore200e->stats->aal5.congestion_experienced),	3056	be32_to_cpu(fore200e->stats->aal5.congestion_experienced),
3057	cpu_to_be32(fore200e->stats->aal5.cspdus_transmitted),	3057	be32_to_cpu(fore200e->stats->aal5.cspdus_transmitted),
3058	cpu_to_be32(fore200e->stats->aal5.cspdus_received),	3058	be32_to_cpu(fore200e->stats->aal5.cspdus_received),
3059	cpu_to_be32(fore200e->stats->aal5.cspdus_dropped),	3059	be32_to_cpu(fore200e->stats->aal5.cspdus_dropped),
3060	cpu_to_be32(fore200e->stats->aal5.cspdus_crc_errors),	3060	be32_to_cpu(fore200e->stats->aal5.cspdus_crc_errors),
3061	cpu_to_be32(fore200e->stats->aal5.cspdus_protocol_errors));	3061	be32_to_cpu(fore200e->stats->aal5.cspdus_protocol_errors));
3062		3062
3063	if (!left--)	3063	if (!left--)
3064	return sprintf(page,"\n"	3064	return sprintf(page,"\n"
@@ -3069,11 +3069,11 @@ fore200e_proc_read(struct atm_dev dev, loff_t pos, char* page)
3069	" large b2:\t\t\t%10u\n"	3069	" large b2:\t\t\t%10u\n"
3070	" RX PDUs:\t\t\t%10u\n"	3070	" RX PDUs:\t\t\t%10u\n"
3071	" TX PDUs:\t\t\t%10lu\n",	3071	" TX PDUs:\t\t\t%10lu\n",
3072	cpu_to_be32(fore200e->stats->aux.small_b1_failed),	3072	be32_to_cpu(fore200e->stats->aux.small_b1_failed),
3073	cpu_to_be32(fore200e->stats->aux.large_b1_failed),	3073	be32_to_cpu(fore200e->stats->aux.large_b1_failed),
3074	cpu_to_be32(fore200e->stats->aux.small_b2_failed),	3074	be32_to_cpu(fore200e->stats->aux.small_b2_failed),
3075	cpu_to_be32(fore200e->stats->aux.large_b2_failed),	3075	be32_to_cpu(fore200e->stats->aux.large_b2_failed),
3076	cpu_to_be32(fore200e->stats->aux.rpd_alloc_failed),	3076	be32_to_cpu(fore200e->stats->aux.rpd_alloc_failed),
3077	fore200e->tx_sat);	3077	fore200e->tx_sat);
3078		3078
3079	if (!left--)	3079	if (!left--)


diff --git a/drivers/atm/fore200e.h b/drivers/atm/fore200e.h index b85a54613dea..183841cc8fdf 100644 --- a/drivers/atm/fore200e.h +++ b/drivers/atm/fore200e.h
@@ -349,90 +349,90 @@ typedef struct oc3_block {
349	/* physical encoding statistics */	349	/* physical encoding statistics */
350		350
351	typedef struct stats_phy {	351	typedef struct stats_phy {
352	u32 crc_header_errors; /* cells received with bad header CRC */	352	__be32 crc_header_errors; /* cells received with bad header CRC */
353	u32 framing_errors; /* cells received with bad framing */	353	__be32 framing_errors; /* cells received with bad framing */
354	u32 pad[ 2 ]; /* i960 padding */	354	__be32 pad[ 2 ]; /* i960 padding */
355	} stats_phy_t;	355	} stats_phy_t;
356		356
357		357
358	/* OC-3 statistics */	358	/* OC-3 statistics */
359		359
360	typedef struct stats_oc3 {	360	typedef struct stats_oc3 {
361	u32 section_bip8_errors; /* section 8 bit interleaved parity */	361	__be32 section_bip8_errors; /* section 8 bit interleaved parity */
362	u32 path_bip8_errors; /* path 8 bit interleaved parity */	362	__be32 path_bip8_errors; /* path 8 bit interleaved parity */
363	u32 line_bip24_errors; /* line 24 bit interleaved parity */	363	__be32 line_bip24_errors; /* line 24 bit interleaved parity */
364	u32 line_febe_errors; /* line far end block errors */	364	__be32 line_febe_errors; /* line far end block errors */
365	u32 path_febe_errors; /* path far end block errors */	365	__be32 path_febe_errors; /* path far end block errors */
366	u32 corr_hcs_errors; /* correctable header check sequence */	366	__be32 corr_hcs_errors; /* correctable header check sequence */
367	u32 ucorr_hcs_errors; /* uncorrectable header check sequence */	367	__be32 ucorr_hcs_errors; /* uncorrectable header check sequence */
368	u32 pad[ 1 ]; /* i960 padding */	368	__be32 pad[ 1 ]; /* i960 padding */
369	} stats_oc3_t;	369	} stats_oc3_t;
370		370
371		371
372	/* ATM statistics */	372	/* ATM statistics */
373		373
374	typedef struct stats_atm {	374	typedef struct stats_atm {
375	u32 cells_transmitted; /* cells transmitted */	375	__be32 cells_transmitted; /* cells transmitted */
376	u32 cells_received; /* cells received */	376	__be32 cells_received; /* cells received */
377	u32 vpi_bad_range; /* cell drops: VPI out of range */	377	__be32 vpi_bad_range; /* cell drops: VPI out of range */
378	u32 vpi_no_conn; /* cell drops: no connection for VPI */	378	__be32 vpi_no_conn; /* cell drops: no connection for VPI */
379	u32 vci_bad_range; /* cell drops: VCI out of range */	379	__be32 vci_bad_range; /* cell drops: VCI out of range */
380	u32 vci_no_conn; /* cell drops: no connection for VCI */	380	__be32 vci_no_conn; /* cell drops: no connection for VCI */
381	u32 pad[ 2 ]; /* i960 padding */	381	__be32 pad[ 2 ]; /* i960 padding */
382	} stats_atm_t;	382	} stats_atm_t;
383		383
384	/* AAL0 statistics */	384	/* AAL0 statistics */
385		385
386	typedef struct stats_aal0 {	386	typedef struct stats_aal0 {
387	u32 cells_transmitted; /* cells transmitted */	387	__be32 cells_transmitted; /* cells transmitted */
388	u32 cells_received; /* cells received */	388	__be32 cells_received; /* cells received */
389	u32 cells_dropped; /* cells dropped */	389	__be32 cells_dropped; /* cells dropped */
390	u32 pad[ 1 ]; /* i960 padding */	390	__be32 pad[ 1 ]; /* i960 padding */
391	} stats_aal0_t;	391	} stats_aal0_t;
392		392
393		393
394	/* AAL3/4 statistics */	394	/* AAL3/4 statistics */
395		395
396	typedef struct stats_aal34 {	396	typedef struct stats_aal34 {
397	u32 cells_transmitted; /* cells transmitted from segmented PDUs */	397	__be32 cells_transmitted; /* cells transmitted from segmented PDUs */
398	u32 cells_received; /* cells reassembled into PDUs */	398	__be32 cells_received; /* cells reassembled into PDUs */
399	u32 cells_crc_errors; /* payload CRC error count */	399	__be32 cells_crc_errors; /* payload CRC error count */
400	u32 cells_protocol_errors; /* SAR or CS layer protocol errors */	400	__be32 cells_protocol_errors; /* SAR or CS layer protocol errors */
401	u32 cells_dropped; /* cells dropped: partial reassembly */	401	__be32 cells_dropped; /* cells dropped: partial reassembly */
402	u32 cspdus_transmitted; /* CS PDUs transmitted */	402	__be32 cspdus_transmitted; /* CS PDUs transmitted */
403	u32 cspdus_received; /* CS PDUs received */	403	__be32 cspdus_received; /* CS PDUs received */
404	u32 cspdus_protocol_errors; /* CS layer protocol errors */	404	__be32 cspdus_protocol_errors; /* CS layer protocol errors */
405	u32 cspdus_dropped; /* reassembled PDUs drop'd (in cells) */	405	__be32 cspdus_dropped; /* reassembled PDUs drop'd (in cells) */
406	u32 pad[ 3 ]; /* i960 padding */	406	__be32 pad[ 3 ]; /* i960 padding */
407	} stats_aal34_t;	407	} stats_aal34_t;
408		408
409		409
410	/* AAL5 statistics */	410	/* AAL5 statistics */
411		411
412	typedef struct stats_aal5 {	412	typedef struct stats_aal5 {
413	u32 cells_transmitted; /* cells transmitted from segmented SDUs */	413	__be32 cells_transmitted; /* cells transmitted from segmented SDUs */
414	u32 cells_received; /* cells reassembled into SDUs */	414	__be32 cells_received; /* cells reassembled into SDUs */
415	u32 cells_dropped; /* reassembled PDUs dropped (in cells) */	415	__be32 cells_dropped; /* reassembled PDUs dropped (in cells) */
416	u32 congestion_experienced; /* CRC error and length wrong */	416	__be32 congestion_experienced; /* CRC error and length wrong */
417	u32 cspdus_transmitted; /* CS PDUs transmitted */	417	__be32 cspdus_transmitted; /* CS PDUs transmitted */
418	u32 cspdus_received; /* CS PDUs received */	418	__be32 cspdus_received; /* CS PDUs received */
419	u32 cspdus_crc_errors; /* CS PDUs CRC errors */	419	__be32 cspdus_crc_errors; /* CS PDUs CRC errors */
420	u32 cspdus_protocol_errors; /* CS layer protocol errors */	420	__be32 cspdus_protocol_errors; /* CS layer protocol errors */
421	u32 cspdus_dropped; /* reassembled PDUs dropped */	421	__be32 cspdus_dropped; /* reassembled PDUs dropped */
422	u32 pad[ 3 ]; /* i960 padding */	422	__be32 pad[ 3 ]; /* i960 padding */
423	} stats_aal5_t;	423	} stats_aal5_t;
424		424
425		425
426	/* auxiliary statistics */	426	/* auxiliary statistics */
427		427
428	typedef struct stats_aux {	428	typedef struct stats_aux {
429	u32 small_b1_failed; /* receive BD allocation failures */	429	__be32 small_b1_failed; /* receive BD allocation failures */
430	u32 large_b1_failed; /* receive BD allocation failures */	430	__be32 large_b1_failed; /* receive BD allocation failures */
431	u32 small_b2_failed; /* receive BD allocation failures */	431	__be32 small_b2_failed; /* receive BD allocation failures */
432	u32 large_b2_failed; /* receive BD allocation failures */	432	__be32 large_b2_failed; /* receive BD allocation failures */
433	u32 rpd_alloc_failed; /* receive PDU allocation failures */	433	__be32 rpd_alloc_failed; /* receive PDU allocation failures */
434	u32 receive_carrier; /* no carrier = 0, carrier = 1 */	434	__be32 receive_carrier; /* no carrier = 0, carrier = 1 */
435	u32 pad[ 2 ]; /* i960 padding */	435	__be32 pad[ 2 ]; /* i960 padding */
436	} stats_aux_t;	436	} stats_aux_t;
437		437
438		438
@@ -643,10 +643,10 @@ typedef struct host_bsq {
643	/* header of the firmware image */	643	/* header of the firmware image */
644		644
645	typedef struct fw_header {	645	typedef struct fw_header {
646	u32 magic; /* magic number */	646	__le32 magic; /* magic number */
647	u32 version; /* firmware version id */	647	__le32 version; /* firmware version id */
648	u32 load_offset; /* fw load offset in board memory */	648	__le32 load_offset; /* fw load offset in board memory */
649	u32 start_offset; /* fw execution start address in board memory */	649	__le32 start_offset; /* fw execution start address in board memory */
650	} fw_header_t;	650	} fw_header_t;
651		651
652	#define FW_HEADER_MAGIC 0x65726f66 /* 'fore' */	652	#define FW_HEADER_MAGIC 0x65726f66 /* 'fore' */