Remove BYTE_PACK.

This commit is contained in:
Ralf Corsepius
2005-05-27 15:21:48 +00:00
parent a8d7bab3a9
commit fd65489a88
2 changed files with 8 additions and 14 deletions

View File

@@ -40,10 +40,6 @@
#include <net/ethernet.h> #include <net/ethernet.h>
#include <net/if_arp.h> #include <net/if_arp.h>
#ifndef BYTE_PACK
#define BYTE_PACK __attribute__((packed))
#endif
#ifdef _KERNEL #ifdef _KERNEL
/* /*
* Macro to map an IP multicast address to an Ethernet multicast address. * Macro to map an IP multicast address to an Ethernet multicast address.
@@ -71,7 +67,7 @@
* RFC 826. * RFC 826.
*/ */
struct ether_arp { 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_sha[ETHER_ADDR_LEN]; /* sender hardware address */
u_char arp_spa[4]; /* sender protocol address */ u_char arp_spa[4]; /* sender protocol address */
u_char arp_tha[ETHER_ADDR_LEN]; /* target hardware 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_pln ea_hdr.ar_pln
#define arp_op ea_hdr.ar_op #define arp_op ea_hdr.ar_op
struct sockaddr_inarp { struct sockaddr_inarp {
u_char sin_len; u_char sin_len;
u_char sin_family; u_char sin_family;

View File

@@ -37,10 +37,6 @@
#ifndef _NETINET_IP_VAR_H_ #ifndef _NETINET_IP_VAR_H_
#define _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). * 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 u_char ipf_mff; /* XXX overlays ip_tos: use low bit
* to avoid destroying tos; * to avoid destroying tos;
* copied from (ip_off&IP_MF) */ * copied from (ip_off&IP_MF) */
u_short ip_len BYTE_PACK; u_short ip_len;
u_short ip_id BYTE_PACK; u_short ip_id;
u_short ip_off BYTE_PACK; u_short ip_off;
u_char ip_ttl; u_char ip_ttl;
u_char ip_p; u_char ip_p;
u_short ip_sum BYTE_PACK; u_short ip_sum;
struct ipasfrag *ipf_next; /* next fragment */ struct ipasfrag *ipf_next; /* next fragment */
struct ipasfrag *ipf_prev; /* previous fragment */ struct ipasfrag *ipf_prev; /* previous fragment */
}; };
@@ -162,8 +158,11 @@ struct ipstat {
#define IP_ROUTETOIF SO_DONTROUTE /* bypass routing tables */ #define IP_ROUTETOIF SO_DONTROUTE /* bypass routing tables */
#define IP_ALLOWBROADCAST SO_BROADCAST /* can send broadcast packets */ #define IP_ALLOWBROADCAST SO_BROADCAST /* can send broadcast packets */
struct ip;
struct inpcb; struct inpcb;
struct route; struct route;
struct sockopt;
struct mbuf;
extern struct ipstat ipstat; extern struct ipstat ipstat;
extern u_short ip_id; /* ip packet ctr, for ids */ extern u_short ip_id; /* ip packet ctr, for ids */