diff options
author | Jan Blunck <jblunck@suse.de> | 2006-01-08 04:05:07 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-08 23:14:07 -0500 |
commit | 6a878184c202395ea17212f111ab9ec4b5f6d6ee (patch) | |
tree | 7a4143652fcb41693af44963b7e94b334dd94f54 /include/net/dn_dev.h | |
parent | d8a33496671e4533aed090793436d58debea6f3a (diff) |
[PATCH] Eliminate __attribute__ ((packed)) warnings for gcc-4.1
Since version 4.1 the gcc is warning about ignored attributes. This patch is
using the equivalent attribute on the struct instead of on each of the
structure or union members.
GCC Manual:
"Specifying Attributes of Types
packed
This attribute, attached to struct or union type definition, specifies
that
each member of the structure or union is placed to minimize the memory
required. When attached to an enum definition, it indicates that the
smallest integral type should be used.
Specifying this attribute for struct and union types is equivalent to
specifying the packed attribute on each of the structure or union
members."
Signed-off-by: Jan Blunck <jblunck@suse.de>
Cc: Dave Jones <davej@codemonkey.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/net/dn_dev.h')
-rw-r--r-- | include/net/dn_dev.h | 84 |
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 { | |||
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); |