1 files changed, 42 insertions, 42 deletions
diff --git a/include/net/dn_dev.h b/include/net/dn_dev.h
index 86e8e86e624a..5a86e78081bf 100644
--- a/include/net/dn_dev.h
+++ b/include/net/dn_dev.h
@@ -88,8 +88,8 @@ struct dn_dev {
        struct net_device *dev;
        struct dn_dev_parms parms;
        char use_long;
-        struct timer_list timer;
+        struct timer_list timer;
-        unsigned long t3;
+        unsigned long t3;
        struct neigh_parms *neigh_parms;
        unsigned char addr[ETH_ALEN];
        struct neighbour *router; /* Default router on circuit */
@@ -99,57 +99,57 @@ struct dn_dev {
 struct dn_short_packet
 {
-        unsigned char   msgflg          __attribute__((packed));
+        unsigned char   msgflg;
-        unsigned short  dstnode         __attribute__((packed));
+        unsigned short  dstnode;
-        unsigned short  srcnode         __attribute__((packed));
+        unsigned short  srcnode;
-        unsigned char   forward         __attribute__((packed));
+        unsigned char   forward;
-};
+} __attribute__((packed));
 struct dn_long_packet
 {
-        unsigned char   msgflg          __attribute__((packed));
+        unsigned char   msgflg;
-        unsigned char   d_area          __attribute__((packed));
+        unsigned char   d_area;
-        unsigned char   d_subarea       __attribute__((packed));
+        unsigned char   d_subarea;
-        unsigned char   d_id[6]         __attribute__((packed));
+        unsigned char   d_id[6];
-        unsigned char   s_area          __attribute__((packed));
+        unsigned char   s_area;
-        unsigned char   s_subarea       __attribute__((packed));
+        unsigned char   s_subarea;
-        unsigned char   s_id[6]         __attribute__((packed));
+        unsigned char   s_id[6];
-        unsigned char   nl2             __attribute__((packed));
+        unsigned char   nl2;
-        unsigned char   visit_ct        __attribute__((packed));
+        unsigned char   visit_ct;
-        unsigned char   s_class         __attribute__((packed));
+        unsigned char   s_class;
-        unsigned char   pt              __attribute__((packed));
+        unsigned char   pt;
-};
+} __attribute__((packed));
 /*------------------------- DRP - Routing messages ---------------------*/
 struct endnode_hello_message
 {
-        unsigned char   msgflg          __attribute__((packed));
+        unsigned char   msgflg;
-        unsigned char   tiver[3]        __attribute__((packed));
+        unsigned char   tiver[3];
-        unsigned char   id[6]           __attribute__((packed));
+        unsigned char   id[6];
-        unsigned char   iinfo           __attribute__((packed));
+        unsigned char   iinfo;
-        unsigned short  blksize         __attribute__((packed));
+        unsigned short  blksize;
-        unsigned char   area            __attribute__((packed));
+        unsigned char   area;
-        unsigned char   seed[8]         __attribute__((packed));
+        unsigned char   seed[8];
-        unsigned char   neighbor[6]     __attribute__((packed));
+        unsigned char   neighbor[6];
-        unsigned short  timer           __attribute__((packed));
+        unsigned short  timer;
-        unsigned char   mpd             __attribute__((packed));
+        unsigned char   mpd;
-        unsigned char   datalen         __attribute__((packed));
+        unsigned char   datalen;
-        unsigned char   data[2]         __attribute__((packed));
+        unsigned char   data[2];
-};
+} __attribute__((packed));
 struct rtnode_hello_message
 {
-        unsigned char   msgflg          __attribute__((packed));
+        unsigned char   msgflg;
-        unsigned char   tiver[3]        __attribute__((packed));
+        unsigned char   tiver[3];
-        unsigned char   id[6]           __attribute__((packed));
+        unsigned char   id[6];
-        unsigned char   iinfo           __attribute__((packed));
+        unsigned char   iinfo;
-        unsigned short  blksize         __attribute__((packed));
+        unsigned short  blksize;
-        unsigned char   priority        __attribute__((packed));
+        unsigned char   priority;
-        unsigned char   area            __attribute__((packed));
+        unsigned char   area;
-        unsigned short  timer           __attribute__((packed));
+        unsigned short  timer;
-        unsigned char   mpd             __attribute__((packed));
+        unsigned char   mpd;
-};
+} __attribute__((packed));
 extern void dn_dev_init(void);

diff --git a/include/net/dn_dev.h b/include/net/dn_dev.h index 86e8e86e624a..5a86e78081bf 100644 --- a/include/net/dn_dev.h +++ b/include/net/dn_dev.h
@@ -88,8 +88,8 @@ struct dn_dev {
88	struct net_device *dev;	88	struct net_device *dev;
89	struct dn_dev_parms parms;	89	struct dn_dev_parms parms;
90	char use_long;	90	char use_long;
91	struct timer_list timer;	91	struct timer_list timer;
92	unsigned long t3;	92	unsigned long t3;
93	struct neigh_parms *neigh_parms;	93	struct neigh_parms *neigh_parms;
94	unsigned char addr[ETH_ALEN];	94	unsigned char addr[ETH_ALEN];
95	struct neighbour router; / Default router on circuit */	95	struct neighbour router; / Default router on circuit */
@@ -99,57 +99,57 @@ struct dn_dev {
99		99
100	struct dn_short_packet	100	struct dn_short_packet
101	{	101	{
102	unsigned char msgflg __attribute__((packed));	102	unsigned char msgflg;
103	unsigned short dstnode __attribute__((packed));	103	unsigned short dstnode;
104	unsigned short srcnode __attribute__((packed));	104	unsigned short srcnode;
105	unsigned char forward __attribute__((packed));	105	unsigned char forward;
106	};	106	} __attribute__((packed));
107		107
108	struct dn_long_packet	108	struct dn_long_packet
109	{	109	{
110	unsigned char msgflg __attribute__((packed));	110	unsigned char msgflg;
111	unsigned char d_area __attribute__((packed));	111	unsigned char d_area;
112	unsigned char d_subarea __attribute__((packed));	112	unsigned char d_subarea;
113	unsigned char d_id[6] __attribute__((packed));	113	unsigned char d_id[6];
114	unsigned char s_area __attribute__((packed));	114	unsigned char s_area;
115	unsigned char s_subarea __attribute__((packed));	115	unsigned char s_subarea;
116	unsigned char s_id[6] __attribute__((packed));	116	unsigned char s_id[6];
117	unsigned char nl2 __attribute__((packed));	117	unsigned char nl2;
118	unsigned char visit_ct __attribute__((packed));	118	unsigned char visit_ct;
119	unsigned char s_class __attribute__((packed));	119	unsigned char s_class;
120	unsigned char pt __attribute__((packed));	120	unsigned char pt;
121	};	121	} __attribute__((packed));
122		122
123	/------------------------- DRP - Routing messages ---------------------/	123	/------------------------- DRP - Routing messages ---------------------/
124		124
125	struct endnode_hello_message	125	struct endnode_hello_message
126	{	126	{
127	unsigned char msgflg __attribute__((packed));	127	unsigned char msgflg;
128	unsigned char tiver[3] __attribute__((packed));	128	unsigned char tiver[3];
129	unsigned char id[6] __attribute__((packed));	129	unsigned char id[6];
130	unsigned char iinfo __attribute__((packed));	130	unsigned char iinfo;
131	unsigned short blksize __attribute__((packed));	131	unsigned short blksize;
132	unsigned char area __attribute__((packed));	132	unsigned char area;
133	unsigned char seed[8] __attribute__((packed));	133	unsigned char seed[8];
134	unsigned char neighbor[6] __attribute__((packed));	134	unsigned char neighbor[6];
135	unsigned short timer __attribute__((packed));	135	unsigned short timer;
136	unsigned char mpd __attribute__((packed));	136	unsigned char mpd;
137	unsigned char datalen __attribute__((packed));	137	unsigned char datalen;
138	unsigned char data[2] __attribute__((packed));	138	unsigned char data[2];
139	};	139	} __attribute__((packed));
140		140
141	struct rtnode_hello_message	141	struct rtnode_hello_message
142	{	142	{
143	unsigned char msgflg __attribute__((packed));	143	unsigned char msgflg;
144	unsigned char tiver[3] __attribute__((packed));	144	unsigned char tiver[3];
145	unsigned char id[6] __attribute__((packed));	145	unsigned char id[6];
146	unsigned char iinfo __attribute__((packed));	146	unsigned char iinfo;
147	unsigned short blksize __attribute__((packed));	147	unsigned short blksize;
148	unsigned char priority __attribute__((packed));	148	unsigned char priority;
149	unsigned char area __attribute__((packed));	149	unsigned char area;
150	unsigned short timer __attribute__((packed));	150	unsigned short timer;
151	unsigned char mpd __attribute__((packed));	151	unsigned char mpd;
152	};	152	} __attribute__((packed));
153		153
154		154
155	extern void dn_dev_init(void);	155	extern void dn_dev_init(void);