2 files changed, 11 insertions, 11 deletions

diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index 12bd294045a7..d5fa36d36515 100644
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -2124,7 +2124,7 @@ static void tms380tr_rcv_status_irq(struct net_device *dev)
                 /* Get the frame size (Byte swap for Intel).
                  * Do this early (see workaround comment below)
                  */
-                Length = be16_to_cpu((unsigned short)rpl->FrameSize);
+                Length = be16_to_cpu(rpl->FrameSize);
 
                 /* Check if the Frame_Start, Frame_End and
                  * Frame_Complete bits are set.
@@ -2140,7 +2140,7 @@ static void tms380tr_rcv_status_irq(struct net_device *dev)
                          * Length2 is there because there have also been
                          * cases where the FrameSize was partially written
                          */
-                        Length2 = be16_to_cpu((unsigned short)rpl->FrameSize);
+                        Length2 = be16_to_cpu(rpl->FrameSize);
 
                         if(Length == 0 || Length != Length2)
                         {
diff --git a/drivers/net/tokenring/tms380tr.h b/drivers/net/tokenring/tms380tr.h
index 2a16078ac3fd..7daf74e31ccd 100644
--- a/drivers/net/tokenring/tms380tr.h
+++ b/drivers/net/tokenring/tms380tr.h
@@ -476,13 +476,13 @@ typedef struct {
                                  * bytes = 0xC000
                                  */
         u_int32_t FunctAddr;    /* High order bytes = 0xC000 */
-        u_int16_t RxListSize;   /* RPL size: 0 (=26), 14, 20 or
+        __be16 RxListSize;      /* RPL size: 0 (=26), 14, 20 or
                                  * 26 bytes read by the adapter.
                                  * (Depending on the number of 
                                  * fragments/list)
                                  */
-        u_int16_t TxListSize;   /* TPL size */
-        u_int16_t BufSize;      /* Is automatically rounded up to the
+        __be16 TxListSize;      /* TPL size */
+        __be16 BufSize;         /* Is automatically rounded up to the
                                  * nearest nK boundary.
                                  */
         u_int16_t FullDuplex;
@@ -580,14 +580,14 @@ typedef struct {
 /*--------------------- Send and Receive definitions -------------------*/
 #pragma pack(1)
 typedef struct {
-        u_int16_t DataCount;    /* Value 0, even and odd values are
+        __be16 DataCount;       /* Value 0, even and odd values are
                                  * permitted; value is unaltered most
                                  * significant bit set: following
                                  * fragments last fragment: most
                                  * significant bit is not evaluated.
                                  * (???)
                                  */
-        u_int32_t DataAddr;     /* Pointer to frame data fragment;
+        __be32 DataAddr;        /* Pointer to frame data fragment;
                                  * even or odd.
                                  */
 } Fragment;
@@ -679,7 +679,7 @@ typedef struct {
 typedef struct s_TPL TPL;
 
 struct s_TPL {  /* Transmit Parameter List (align on even word boundaries) */
-        u_int32_t NextTPLAddr;          /* Pointer to next TPL in chain; if
+        __be32 NextTPLAddr;             /* Pointer to next TPL in chain; if
                                          * pointer is odd: this is the last
                                          * TPL. Pointing to itself can cause
                                          * problems!
@@ -689,7 +689,7 @@ struct s_TPL {	/* Transmit Parameter List (align on even word boundaries) */
                                          * significant bit first! Set by the
                                          * adapter: CSTAT_COMPLETE status.
                                          */
-        u_int16_t FrameSize;            /* Number of bytes to be transmitted
+        __be16 FrameSize;               /* Number of bytes to be transmitted
                                          * as a frame including AC/FC,
                                          * Destination, Source, Routing field
                                          * not including CRC, FS, End Delimiter
@@ -1020,7 +1020,7 @@ enum SKB_STAT {
 #pragma pack(1)
 typedef struct s_RPL RPL;
 struct s_RPL {  /* Receive Parameter List */
-        u_int32_t NextRPLAddr;          /* Pointer to next RPL in chain
+        __be32 NextRPLAddr;             /* Pointer to next RPL in chain
                                          * (normalized = physical 32 bit
                                          * address) if pointer is odd: this
                                          * is last RPL. Pointing to itself can
@@ -1031,7 +1031,7 @@ struct s_RPL {	/* Receive Parameter List */
                                          * adapter in lists that start or end
                                          * a frame.
                                          */
-        volatile u_int16_t FrameSize;    /* Number of bytes received as a
+        volatile __be16 FrameSize;       /* Number of bytes received as a
                                          * frame including AC/FC, Destination,
                                          * Source, Routing field not including 
                                          * CRC, FS (Frame Status), End Delimiter