diff options
author | alfred <alfred@FreeBSD.org> | 2002-09-23 06:25:08 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2002-09-23 06:25:08 +0000 |
commit | 9bda36d99712c4dcd253f988e696579f3ce3653c (patch) | |
tree | c64473ad2e9302c65a81387cb678dd7c17089662 /sys/net | |
parent | d5db7184e3f5c8d842f1e4407084d75fc49e953e (diff) | |
download | FreeBSD-src-9bda36d99712c4dcd253f988e696579f3ce3653c.zip FreeBSD-src-9bda36d99712c4dcd253f988e696579f3ce3653c.tar.gz |
s/__attribute__((__packed__))/__packed/g
Diffstat (limited to 'sys/net')
-rw-r--r-- | sys/net/if_arc.h | 4 | ||||
-rw-r--r-- | sys/net/if_gre.h | 8 | ||||
-rw-r--r-- | sys/net/if_llc.h | 18 | ||||
-rw-r--r-- | sys/net/if_spppsubr.c | 6 |
4 files changed, 18 insertions, 18 deletions
diff --git a/sys/net/if_arc.h b/sys/net/if_arc.h index b430698..9f2da93 100644 --- a/sys/net/if_arc.h +++ b/sys/net/if_arc.h @@ -46,7 +46,7 @@ */ struct arc_addr { u_int8_t arc_addr_octet[1]; -} __attribute__((__packed__)); +} __packed; /* * Structure of a 2.5MB/s Arcnet header. @@ -69,7 +69,7 @@ struct arc_header { u_int8_t arc_type2; /* same as arc_type */ u_int8_t arc_flag2; /* real flag value */ u_int16_t arc_seqid2; /* real seqid value */ -} __attribute__((__packed__)); +} __packed; #define ARC_ADDR_LEN 1 diff --git a/sys/net/if_gre.h b/sys/net/if_gre.h index 84e2e61..a626ee7 100644 --- a/sys/net/if_gre.h +++ b/sys/net/if_gre.h @@ -84,12 +84,12 @@ struct gre_h { struct gre_sre[] routing Routing fileds (see below) Present if (rt_pres == 1) */ -} __attribute__((__packed__)); +} __packed; struct greip { struct ip gi_i; struct gre_h gi_g; -} __attribute__((__packed__)); +} __packed; #define gi_pr gi_i.ip_p #define gi_len gi_i.ip_len @@ -128,12 +128,12 @@ struct mobile_h { u_int16_t hcrc; /* header checksum */ u_int32_t odst; /* original destination address */ u_int32_t osrc; /* original source addr, if S-bit set */ -} __attribute__((__packed__)); +} __packed; struct mobip_h { struct ip mi; struct mobile_h mh; -} __attribute__((__packed__)); +} __packed; #define MOB_H_SIZ_S (sizeof(struct mobile_h) - sizeof(u_int32_t)) diff --git a/sys/net/if_llc.h b/sys/net/if_llc.h index 3bf5676..368c4e0 100644 --- a/sys/net/if_llc.h +++ b/sys/net/if_llc.h @@ -56,15 +56,15 @@ struct llc { u_int8_t format_id; u_int8_t class; u_int8_t window_x2; - } type_u __attribute__((__packed__)); + } type_u __packed; struct { u_int8_t num_snd_x2; u_int8_t num_rcv_x2; - } type_i __attribute__((__packed__)); + } type_i __packed; struct { u_int8_t control; u_int8_t num_rcv_x2; - } type_s __attribute__((__packed__)); + } type_s __packed; struct { u_int8_t control; /* @@ -76,18 +76,18 @@ struct llc { u_int8_t frmr_control; u_int8_t frmr_control_ext; u_int8_t frmr_cause; - } type_frmr __attribute__((__packed__)); + } type_frmr __packed; struct { u_int8_t control; u_int8_t org_code[3]; u_int16_t ether_type; - } type_snap __attribute__((__packed__)); + } type_snap __packed; struct { u_int8_t control; u_int8_t control_ext; - } type_raw __attribute__((__packed__)); - } llc_un /* XXX __attribute__((__packed__)) ??? */; -} __attribute__((__packed__)); + } type_raw __packed; + } llc_un /* XXX __packed ??? */; +} __packed; struct frmrinfo { u_int8_t frmr_rej_pdu0; @@ -95,7 +95,7 @@ struct frmrinfo { u_int8_t frmr_control; u_int8_t frmr_control_ext; u_int8_t frmr_cause; -} __attribute__((__packed__)); +} __packed; #define llc_control llc_un.type_u.control #define llc_control_ext llc_un.type_raw.control_ext diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c index 5a9184b..3709f71 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -212,14 +212,14 @@ struct ppp_header { u_char address; u_char control; u_short protocol; -} __attribute__((__packed__)); +} __packed; #define PPP_HEADER_LEN sizeof (struct ppp_header) struct lcp_header { u_char type; u_char ident; u_short len; -} __attribute__((__packed__)); +} __packed; #define LCP_HEADER_LEN sizeof (struct lcp_header) struct cisco_packet { @@ -229,7 +229,7 @@ struct cisco_packet { u_short rel; u_short time0; u_short time1; -} __attribute__((__packed__)); +} __packed; #define CISCO_PACKET_LEN sizeof (struct cisco_packet) /* |