From fd65489a887c98a34ab65e57f2f20fcfeb44b027 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 27 May 2005 15:21:48 +0000 Subject: Remove BYTE_PACK. --- cpukit/libnetworking/netinet/if_ether.h | 7 +------ cpukit/libnetworking/netinet/ip_var.h | 15 +++++++-------- 2 files changed, 8 insertions(+), 14 deletions(-) (limited to 'cpukit') diff --git a/cpukit/libnetworking/netinet/if_ether.h b/cpukit/libnetworking/netinet/if_ether.h index fba219ac35..191b08e452 100644 --- a/cpukit/libnetworking/netinet/if_ether.h +++ b/cpukit/libnetworking/netinet/if_ether.h @@ -40,10 +40,6 @@ #include #include -#ifndef BYTE_PACK -#define BYTE_PACK __attribute__((packed)) -#endif - #ifdef _KERNEL /* * Macro to map an IP multicast address to an Ethernet multicast address. @@ -71,7 +67,7 @@ * RFC 826. */ struct ether_arp { - struct arphdr ea_hdr BYTE_PACK; /* fixed-size header */ + struct arphdr ea_hdr; /* fixed-size header */ u_char arp_sha[ETHER_ADDR_LEN]; /* sender hardware address */ u_char arp_spa[4]; /* sender protocol address */ u_char arp_tha[ETHER_ADDR_LEN]; /* target hardware address */ @@ -83,7 +79,6 @@ struct ether_arp { #define arp_pln ea_hdr.ar_pln #define arp_op ea_hdr.ar_op - struct sockaddr_inarp { u_char sin_len; u_char sin_family; diff --git a/cpukit/libnetworking/netinet/ip_var.h b/cpukit/libnetworking/netinet/ip_var.h index a8ebc6a75f..b5d4a95251 100644 --- a/cpukit/libnetworking/netinet/ip_var.h +++ b/cpukit/libnetworking/netinet/ip_var.h @@ -37,10 +37,6 @@ #ifndef _NETINET_IP_VAR_H_ #define _NETINET_IP_VAR_H_ -#ifndef BYTE_PACK -#define BYTE_PACK __attribute__((packed)) -#endif - /* * Overlay for ip header used by other protocols (tcp, udp). */ @@ -90,12 +86,12 @@ struct ipasfrag { u_char ipf_mff; /* XXX overlays ip_tos: use low bit * to avoid destroying tos; * copied from (ip_off&IP_MF) */ - u_short ip_len BYTE_PACK; - u_short ip_id BYTE_PACK; - u_short ip_off BYTE_PACK; + u_short ip_len; + u_short ip_id; + u_short ip_off; u_char ip_ttl; u_char ip_p; - u_short ip_sum BYTE_PACK; + u_short ip_sum; struct ipasfrag *ipf_next; /* next fragment */ struct ipasfrag *ipf_prev; /* previous fragment */ }; @@ -162,8 +158,11 @@ struct ipstat { #define IP_ROUTETOIF SO_DONTROUTE /* bypass routing tables */ #define IP_ALLOWBROADCAST SO_BROADCAST /* can send broadcast packets */ +struct ip; struct inpcb; struct route; +struct sockopt; +struct mbuf; extern struct ipstat ipstat; extern u_short ip_id; /* ip packet ctr, for ids */ -- cgit v1.2.3