aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/tokenring/tms380tr.c4
-rw-r--r--drivers/net/tokenring/tms380tr.h18
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)
2124 /* Get the frame size (Byte swap for Intel). 2124 /* Get the frame size (Byte swap for Intel).
2125 * Do this early (see workaround comment below) 2125 * Do this early (see workaround comment below)
2126 */ 2126 */
2127 Length = be16_to_cpu((unsigned short)rpl->FrameSize); 2127 Length = be16_to_cpu(rpl->FrameSize);
2128 2128
2129 /* Check if the Frame_Start, Frame_End and 2129 /* Check if the Frame_Start, Frame_End and
2130 * Frame_Complete bits are set. 2130 * Frame_Complete bits are set.
@@ -2140,7 +2140,7 @@ static void tms380tr_rcv_status_irq(struct net_device *dev)
2140 * Length2 is there because there have also been 2140 * Length2 is there because there have also been
2141 * cases where the FrameSize was partially written 2141 * cases where the FrameSize was partially written
2142 */ 2142 */
2143 Length2 = be16_to_cpu((unsigned short)rpl->FrameSize); 2143 Length2 = be16_to_cpu(rpl->FrameSize);
2144 2144
2145 if(Length == 0 || Length != Length2) 2145 if(Length == 0 || Length != Length2)
2146 { 2146 {
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 {
476 * bytes = 0xC000 476 * bytes = 0xC000
477 */ 477 */
478 u_int32_t FunctAddr; /* High order bytes = 0xC000 */ 478 u_int32_t FunctAddr; /* High order bytes = 0xC000 */
479 u_int16_t RxListSize; /* RPL size: 0 (=26), 14, 20 or 479 __be16 RxListSize; /* RPL size: 0 (=26), 14, 20 or
480 * 26 bytes read by the adapter. 480 * 26 bytes read by the adapter.
481 * (Depending on the number of 481 * (Depending on the number of
482 * fragments/list) 482 * fragments/list)
483 */ 483 */
484 u_int16_t TxListSize; /* TPL size */ 484 __be16 TxListSize; /* TPL size */
485 u_int16_t BufSize; /* Is automatically rounded up to the 485 __be16 BufSize; /* Is automatically rounded up to the
486 * nearest nK boundary. 486 * nearest nK boundary.
487 */ 487 */
488 u_int16_t FullDuplex; 488 u_int16_t FullDuplex;
@@ -580,14 +580,14 @@ typedef struct {
580/*--------------------- Send and Receive definitions -------------------*/ 580/*--------------------- Send and Receive definitions -------------------*/
581#pragma pack(1) 581#pragma pack(1)
582typedef struct { 582typedef struct {
583 u_int16_t DataCount; /* Value 0, even and odd values are 583 __be16 DataCount; /* Value 0, even and odd values are
584 * permitted; value is unaltered most 584 * permitted; value is unaltered most
585 * significant bit set: following 585 * significant bit set: following
586 * fragments last fragment: most 586 * fragments last fragment: most
587 * significant bit is not evaluated. 587 * significant bit is not evaluated.
588 * (???) 588 * (???)
589 */ 589 */
590 u_int32_t DataAddr; /* Pointer to frame data fragment; 590 __be32 DataAddr; /* Pointer to frame data fragment;
591 * even or odd. 591 * even or odd.
592 */ 592 */
593} Fragment; 593} Fragment;
@@ -679,7 +679,7 @@ typedef struct {
679typedef struct s_TPL TPL; 679typedef struct s_TPL TPL;
680 680
681struct s_TPL { /* Transmit Parameter List (align on even word boundaries) */ 681struct s_TPL { /* Transmit Parameter List (align on even word boundaries) */
682 u_int32_t NextTPLAddr; /* Pointer to next TPL in chain; if 682 __be32 NextTPLAddr; /* Pointer to next TPL in chain; if
683 * pointer is odd: this is the last 683 * pointer is odd: this is the last
684 * TPL. Pointing to itself can cause 684 * TPL. Pointing to itself can cause
685 * problems! 685 * problems!
@@ -689,7 +689,7 @@ struct s_TPL { /* Transmit Parameter List (align on even word boundaries) */
689 * significant bit first! Set by the 689 * significant bit first! Set by the
690 * adapter: CSTAT_COMPLETE status. 690 * adapter: CSTAT_COMPLETE status.
691 */ 691 */
692 u_int16_t FrameSize; /* Number of bytes to be transmitted 692 __be16 FrameSize; /* Number of bytes to be transmitted
693 * as a frame including AC/FC, 693 * as a frame including AC/FC,
694 * Destination, Source, Routing field 694 * Destination, Source, Routing field
695 * not including CRC, FS, End Delimiter 695 * not including CRC, FS, End Delimiter
@@ -1020,7 +1020,7 @@ enum SKB_STAT {
1020#pragma pack(1) 1020#pragma pack(1)
1021typedef struct s_RPL RPL; 1021typedef struct s_RPL RPL;
1022struct s_RPL { /* Receive Parameter List */ 1022struct s_RPL { /* Receive Parameter List */
1023 u_int32_t NextRPLAddr; /* Pointer to next RPL in chain 1023 __be32 NextRPLAddr; /* Pointer to next RPL in chain
1024 * (normalized = physical 32 bit 1024 * (normalized = physical 32 bit
1025 * address) if pointer is odd: this 1025 * address) if pointer is odd: this
1026 * is last RPL. Pointing to itself can 1026 * is last RPL. Pointing to itself can
@@ -1031,7 +1031,7 @@ struct s_RPL { /* Receive Parameter List */
1031 * adapter in lists that start or end 1031 * adapter in lists that start or end
1032 * a frame. 1032 * a frame.
1033 */ 1033 */
1034 volatile u_int16_t FrameSize; /* Number of bytes received as a 1034 volatile __be16 FrameSize; /* Number of bytes received as a
1035 * frame including AC/FC, Destination, 1035 * frame including AC/FC, Destination,
1036 * Source, Routing field not including 1036 * Source, Routing field not including
1037 * CRC, FS (Frame Status), End Delimiter 1037 * CRC, FS (Frame Status), End Delimiter