summaryrefslogtreecommitdiffstats
path: root/include/linux/if_frad.h
diff options
context:
space:
mode:
authorJan Blunck <jblunck@suse.de>2006-01-08 01:05:07 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-08 20:14:07 -0800
commit6a878184c202395ea17212f111ab9ec4b5f6d6ee (patch)
tree7a4143652fcb41693af44963b7e94b334dd94f54 /include/linux/if_frad.h
parentd8a33496671e4533aed090793436d58debea6f3a (diff)
downloadlinux-stable-6a878184c202395ea17212f111ab9ec4b5f6d6ee.tar.gz
linux-stable-6a878184c202395ea17212f111ab9ec4b5f6d6ee.tar.bz2
linux-stable-6a878184c202395ea17212f111ab9ec4b5f6d6ee.zip
[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/linux/if_frad.h')
-rw-r--r--include/linux/if_frad.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h
index 511999c7eeda..395f0aad9cbf 100644
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
@@ -131,17 +131,17 @@ struct frad_conf
/* these are the fields of an RFC 1490 header */
struct frhdr
{
- unsigned char control __attribute__((packed));
+ unsigned char control;
/* for IP packets, this can be the NLPID */
- unsigned char pad __attribute__((packed));
+ unsigned char pad;
- unsigned char NLPID __attribute__((packed));
- unsigned char OUI[3] __attribute__((packed));
- unsigned short PID __attribute__((packed));
+ unsigned char NLPID;
+ unsigned char OUI[3];
+ unsigned short PID;
#define IP_NLPID pad
-};
+} __attribute__((packed));
/* see RFC 1490 for the definition of the following */
#define FRAD_I_UI 0x03