aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/if_tr.h6
-rw-r--r--net/802/tr.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/if_tr.h b/include/linux/if_tr.h
index a2b01e1e72f2..6688b414c529 100644
--- a/include/linux/if_tr.h
+++ b/include/linux/if_tr.h
@@ -36,8 +36,8 @@ struct trh_hdr {
36 __u8 fc; /* frame control field */ 36 __u8 fc; /* frame control field */
37 __u8 daddr[TR_ALEN]; /* destination address */ 37 __u8 daddr[TR_ALEN]; /* destination address */
38 __u8 saddr[TR_ALEN]; /* source address */ 38 __u8 saddr[TR_ALEN]; /* source address */
39 __u16 rcf; /* route control field */ 39 __be16 rcf; /* route control field */
40 __u16 rseg[8]; /* routing registers */ 40 __be16 rseg[8]; /* routing registers */
41}; 41};
42 42
43#ifdef __KERNEL__ 43#ifdef __KERNEL__
@@ -55,7 +55,7 @@ struct trllc {
55 __u8 ssap; /* source SAP */ 55 __u8 ssap; /* source SAP */
56 __u8 llc; /* LLC control field */ 56 __u8 llc; /* LLC control field */
57 __u8 protid[3]; /* protocol id */ 57 __u8 protid[3]; /* protocol id */
58 __u16 ethertype; /* ether type field */ 58 __be16 ethertype; /* ether type field */
59}; 59};
60 60
61/* Token-Ring statistics collection data. */ 61/* Token-Ring statistics collection data. */
diff --git a/net/802/tr.c b/net/802/tr.c
index 85293ccf7efc..3bfb86260f27 100644
--- a/net/802/tr.c
+++ b/net/802/tr.c
@@ -50,8 +50,8 @@ static void rif_check_expire(unsigned long dummy);
50struct rif_cache_s { 50struct rif_cache_s {
51 unsigned char addr[TR_ALEN]; 51 unsigned char addr[TR_ALEN];
52 int iface; 52 int iface;
53 __u16 rcf; 53 __be16 rcf;
54 __u16 rseg[8]; 54 __be16 rseg[8];
55 struct rif_cache_s *next; 55 struct rif_cache_s *next;
56 unsigned long last_used; 56 unsigned long last_used;
57 unsigned char local_ring; 57 unsigned char local_ring;