diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2010-11-20 20:11:20 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-11-20 20:11:20 +0000 |
| commit | 314a490e59e1938d0e0c5a4b187f56fe0fd9a533 (patch) | |
| tree | 26b68dab3e6cb690453d9ef29644bc7669c113af /sys/net | |
| parent | 2fcce56307d1ceb3af1a9fc40c291d59d9cc098d (diff) | |
__attribute__((packed)) -> __packed. The ioprbs.c chunk was commented out, and
uncommenting it is intentional.
ok deraadt@
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/pipex_local.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/net/pipex_local.h b/sys/net/pipex_local.h index 6797a9b5b8e..b4b39008cc2 100644 --- a/sys/net/pipex_local.h +++ b/sys/net/pipex_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex_local.h,v 1.9 2010/09/24 14:50:30 hsuenaga Exp $ */ +/* $OpenBSD: pipex_local.h,v 1.10 2010/11/20 20:11:19 miod Exp $ */ /* * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -220,7 +220,7 @@ struct pipex_gre_header { uint16_t len; /* length not include gre header */ uint16_t call_id; /* call_id */ -} __attribute__((__packed__)); +} __packed; /* pppoe header */ struct pipex_pppoe_header { @@ -232,7 +232,7 @@ struct pipex_pppoe_header { uint16_t session_id; /* session id */ uint16_t length; /* length */ -} __attribute__((__packed__)); +} __packed; /* l2tp header */ struct pipex_l2tp_header { @@ -249,18 +249,18 @@ struct pipex_l2tp_header { uint16_t tunnel_id; uint16_t session_id; /* can be followed by option header */ -} __attribute__((__packed__)); +} __packed; /* l2tp option header */ struct pipex_l2tp_seq_header { uint16_t ns; uint16_t nr; -} __attribute__((__packed__)); +} __packed; struct pipex_l2tp_offset_header { uint16_t offset_size; /* uint8_t offset_pad[] */ -} __attribute__((__packed__)); +} __packed; #ifdef PIPEX_DEBUG #define PIPEX_DBG(a) if (pipex_debug & 1) pipex_session_log a |