From fe9f220a60f1f7aff5b43db98748277f5d22754d Mon Sep 17 00:00:00 2001 From: julian Date: Fri, 20 Aug 2004 01:24:23 +0000 Subject: Align netgraph message fields ready for 64-bit (and 128 bit :-) machines. requires a recompile of netgraph users. Also change the size of a field in the bluetooth code that was waiting for the next change that needed recompiles so it could piggyback its way in. Submitted by: jdp, maksim MFC after: 2 days --- sys/netgraph/ng_message.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'sys/netgraph/ng_message.h') diff --git a/sys/netgraph/ng_message.h b/sys/netgraph/ng_message.h index 715d114..a8f4254 100644 --- a/sys/netgraph/ng_message.h +++ b/sys/netgraph/ng_message.h @@ -67,10 +67,11 @@ struct ng_mesg { u_char version; /* == NGM_VERSION */ u_char spare; /* pad to 2 bytes */ u_int16_t arglen; /* length of data */ + u_int32_t cmd; /* command identifier */ u_int32_t flags; /* message status */ + u_int32_t spare2; /* pad to 8 bytes */ u_int32_t token; /* match with reply */ u_int32_t typecookie; /* node's type cookie */ - u_int32_t cmd; /* command identifier */ u_char cmdstr[NG_CMDSTRSIZ]; /* cmd string + \0 */ } header; char data[]; /* placeholder for actual data */ @@ -84,10 +85,11 @@ struct ng_mesg { { "version", &ng_parse_uint8_type }, \ { "spare", &ng_parse_uint8_type }, \ { "arglen", &ng_parse_uint16_type }, \ + { "cmd", &ng_parse_uint32_type }, \ { "flags", &ng_parse_hint32_type }, \ + { "spare2", &ng_parse_uint32_type }, \ { "token", &ng_parse_uint32_type }, \ { "typecookie", &ng_parse_uint32_type }, \ - { "cmd", &ng_parse_uint32_type }, \ { "cmdstr", &ng_parse_cmdbuf_type }, \ { "data", (dtype) }, \ { NULL } \ @@ -98,7 +100,7 @@ struct ng_mesg { * Interfaces within the kernel are defined by a different * value (see NG_ABI_VERSION in netgraph.g) */ -#define NG_VERSION 6 +#define NG_VERSION 7 /* Flags field flags */ #define NGF_ORIG 0x00000000 /* the msg is the original request */ -- cgit v1.1