Globally replace u_int*_t from (non-contributed) man pages.

The reasoning behind this, is that if we are consistent in our
documentation about the uint*_t stuff, people will be less tempted to
write new code that uses the non-standard types.

I am not going to bump the man page dates, as these changes can be
considered style nits. The meaning of the man pages is unaffected.

MFC after:	1 month

24 files changed, 149 insertions, 149 deletions

diff --git a/share/man/man4/agp.4 b/share/man/man4/agp.4
index 06bee73..8af97d6 100644
--- a/share/man/man4/agp.4
+++ b/share/man/man4/agp.4
@@ -80,8 +80,8 @@ The result is a pointer to the following structure:
 .Bd -literal
 typedef struct _agp_info {
 	agp_version version;  /* version of the driver        */
-	u_int32_t bridge_id;  /* bridge vendor/device         */
-	u_int32_t agp_mode;   /* mode info of bridge          */
+	uint32_t bridge_id;   /* bridge vendor/device         */
+	uint32_t agp_mode;    /* mode info of bridge          */
 	off_t aper_base;      /* base of aperture             */
 	size_t aper_size;     /* size of aperture             */
 	size_t pg_total;      /* max pages (swap + system)    */
@@ -105,7 +105,7 @@ This
 takes the following structure:
 .Bd -literal
 typedef struct _agp_setup {
-	u_int32_t agp_mode;   /* mode info of bridge */
+	uint32_t agp_mode;    /* mode info of bridge */
 } agp_setup;
 .Ed
 .Pp
@@ -120,8 +120,8 @@ takes the following structure:
 typedef struct _agp_allocate {
 	int key;              /* tag of allocation            */
 	size_t pg_count;      /* number of pages              */
-	u_int32_t type;       /* 0 == normal, other devspec   */
-	u_int32_t physical;   /* device specific (some devices
+	uint32_t type;        /* 0 == normal, other devspec   */
+	uint32_t physical;    /* device specific (some devices
 			       * need a phys address of the
 			       * actual page behind the gatt
 			       * table)                       */
@@ -159,7 +159,7 @@ takes the following structure:
 .Bd -literal
 typedef struct _agp_unbind {
 	int key;                /* tag of allocation         */
-	u_int32_t priority;     /* priority for paging out   */
+	uint32_t priority;      /* priority for paging out   */
 } agp_unbind;
 .Ed
 .El
diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4
index e6c3665..1c6026f 100644
--- a/share/man/man4/icmp6.4
+++ b/share/man/man4/icmp6.4
@@ -140,13 +140,13 @@ This header corresponds to the
 structure and has the following definition:
 .Bd -literal -offset indent
 struct icmp6_hdr {
-	u_int8_t	icmp6_type;	/* type field */
-	u_int8_t	icmp6_code;	/* code field */
-	u_int16_t	icmp6_cksum;	/* checksum field */
+	uint8_t  icmp6_type;	/* type field */
+	uint8_t  icmp6_code;	/* code field */
+	uint16_t icmp6_cksum;	/* checksum field */
 	union {
-		u_int32_t icmp6_un_data32[1]; /* type-specific */
-		u_int16_t icmp6_un_data16[2]; /* type-specific */
-		u_int8_t  icmp6_un_data8[4];  /* type-specific */
+		uint32_t icmp6_un_data32[1]; /* type-specific */
+		uint16_t icmp6_un_data16[2]; /* type-specific */
+		uint8_t  icmp6_un_data8[4];  /* type-specific */
 	} icmp6_dataun;
 } __packed;
 
diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4
index b796851..fdbb956 100644
--- a/share/man/man4/ip6.4
+++ b/share/man/man4/ip6.4
@@ -75,12 +75,12 @@ The header has the following definition:
 struct ip6_hdr {
      union {
           struct ip6_hdrctl {
-               u_int32_t ip6_un1_flow;	/* 20 bits of flow ID */
-               u_int16_t ip6_un1_plen;	/* payload length */
-               u_int8_t	 ip6_un1_nxt;	/* next header */
-               u_int8_t	 ip6_un1_hlim;	/* hop limit */
+               uint32_t ip6_un1_flow;	/* 20 bits of flow ID */
+               uint16_t ip6_un1_plen;	/* payload length */
+               uint8_t  ip6_un1_nxt;	/* next header */
+               uint8_t  ip6_un1_hlim;	/* hop limit */
           } ip6_un1;
-          u_int8_t ip6_un2_vfc;   /* version and class */
+          uint8_t ip6_un2_vfc;	/* version and class */
      } ip6_ctlun;
      struct in6_addr ip6_src;	/* source address */
      struct in6_addr ip6_dst;	/* destination address */
@@ -121,8 +121,8 @@ The IPv6 header may be followed by any number of extension headers that start
 with the following generic definition:
 .Bd -literal -offset indent
 struct ip6_ext {
-     u_int8_t ip6e_nxt;
-     u_int8_t ip6e_len;
+     uint8_t ip6e_nxt;
+     uint8_t ip6e_len;
 } __packed;
 .Ed
 .Ss Options
@@ -281,8 +281,8 @@ The option is stored in the following structure in the ancillary data
 returned:
 .Bd -literal
 struct ip6_hbh {
-	u_int8_t ip6h_nxt;	/* next header */
-	u_int8_t ip6h_len;	/* length in units of 8 octets */
+	uint8_t ip6h_nxt;	/* next header */
+	uint8_t ip6h_len;	/* length in units of 8 octets */
 /* followed by options */
 } __packed;
 .Ed
@@ -301,8 +301,8 @@ The option is stored in the following structure in the ancillary data
 returned:
 .Bd -literal
 struct ip6_dest {
-	u_int8_t ip6d_nxt;	/* next header */
-	u_int8_t ip6d_len;	/* length in units of 8 octets */
+	uint8_t ip6d_nxt;	/* next header */
+	uint8_t ip6d_len;	/* length in units of 8 octets */
 /* followed by options */
 } __packed;
 .Ed
@@ -333,10 +333,10 @@ The header is stored in the following structure in the ancillary data
 returned:
 .Bd -literal
 struct ip6_rthdr {
-	u_int8_t ip6r_nxt;	/* next header */
-	u_int8_t ip6r_len;	/* length in units of 8 octets */
-	u_int8_t ip6r_type;	/* routing type */
-	u_int8_t ip6r_segleft;	/* segments left */
+	uint8_t ip6r_nxt;	/* next header */
+	uint8_t ip6r_len;	/* length in units of 8 octets */
+	uint8_t ip6r_type;	/* routing type */
+	uint8_t ip6r_segleft;	/* segments left */
 /* followed by routing-type-specific data */
 } __packed;
 .Ed
diff --git a/share/man/man4/mem.4 b/share/man/man4/mem.4
index 5dd2cb9..38c5110 100644
--- a/share/man/man4/mem.4
+++ b/share/man/man4/mem.4
@@ -101,8 +101,8 @@ The region cannot be written to.
 Memory ranges are described by
 .Vt struct mem_range_desc :
 .Bd -literal -offset indent
-u_int64_t	mr_base;	/\(** physical base address \(**/
-u_int64_t	mr_len;		/\(** physical length of region \(**/
+uint64_t	mr_base;	/\(** physical base address \(**/
+uint64_t	mr_len;		/\(** physical length of region \(**/
 int		mr_flags;	/\(** attributes of region \(**/
 char		mr_owner[8];
 .Ed
diff --git a/share/man/man4/mtio.4 b/share/man/man4/mtio.4
index f3dd602..e8056e6 100644
--- a/share/man/man4/mtio.4
+++ b/share/man/man4/mtio.4
@@ -175,7 +175,7 @@ struct mtget {
 #if defined (__FreeBSD__)
 	int32_t mt_blksiz;	/* presently operating blocksize */
 	int32_t mt_density;	/* presently operating density */
-	u_int32_t mt_comp;	/* presently operating compression */
+	uint32_t mt_comp;	/* presently operating compression */
 	int32_t mt_blksiz0;	/* blocksize for mode 0 */
 	int32_t mt_blksiz1;	/* blocksize for mode 1 */
 	int32_t mt_blksiz2;	/* blocksize for mode 2 */
@@ -185,10 +185,10 @@ struct mtget {
 	int32_t mt_density2;	/* density for mode 2 */
 	int32_t mt_density3;	/* density for mode 3 */
 /* the following are not yet implemented */
-	u_int32_t mt_comp0;	/* compression type for mode 0 */
-	u_int32_t mt_comp1;	/* compression type for mode 1 */
-	u_int32_t mt_comp2;	/* compression type for mode 2 */
-	u_int32_t mt_comp3;	/* compression type for mode 3 */
+	uint32_t mt_comp0;	/* compression type for mode 0 */
+	uint32_t mt_comp1;	/* compression type for mode 1 */
+	uint32_t mt_comp2;	/* compression type for mode 2 */
+	uint32_t mt_comp3;	/* compression type for mode 3 */
 /* end not yet implemented */
 #endif
 	int32_t	mt_fileno;	/* relative file number of current position */
@@ -203,23 +203,23 @@ struct scsi_tape_errors {
 	 * Check Condition noted for these operations. The act
 	 * of issuing an MTIOCERRSTAT unlatches and clears them.
 	 */
-	u_int8_t io_sense[32];	/* Last Sense Data For Data I/O */
+	uint8_t io_sense[32];	/* Last Sense Data For Data I/O */
 	int32_t io_resid;	/* residual count from last Data I/O */
-	u_int8_t io_cdb[16];	/* Command that Caused the Last Data Sense */
-	u_int8_t ctl_sense[32];	/* Last Sense Data For Control I/O */
+	uint8_t io_cdb[16];	/* Command that Caused the Last Data Sense */
+	uint8_t ctl_sense[32];	/* Last Sense Data For Control I/O */
 	int32_t ctl_resid;	/* residual count from last Control I/O */
-	u_int8_t ctl_cdb[16];	/* Command that Caused the Last Control Sense */
+	uint8_t ctl_cdb[16];	/* Command that Caused the Last Control Sense */
 	/*
 	 * These are the read and write cumulative error counters.
 	 * (how to reset cumulative error counters is not yet defined).
 	 * (not implemented as yet but space is being reserved for them)
 	 */
 	struct {
-		u_int32_t retries;	/* total # retries performed */
-		u_int32_t corrected;	/* total # corrections performed */
-		u_int32_t processed;	/* total # corrections successful */
-		u_int32_t failures;	/* total # corrections/retries failed */
-		u_int64_t nbytes;	/* total # bytes processed */
+		uint32_t retries;	/* total # retries performed */
+		uint32_t corrected;	/* total # corrections performed */
+		uint32_t processed;	/* total # corrections successful */
+		uint32_t failures;	/* total # corrections/retries failed */
+		uint64_t nbytes;	/* total # bytes processed */
 	} wterr, rderr;
 };
 
@@ -265,18 +265,18 @@ union mterrstat {
  * rethink these ioctls to support all the entities they haul into
  * the picture (64 bit blocks, logical file record numbers, etc..).
  */
-#define	MTIOCRDSPOS	_IOR('m', 5, u_int32_t)	/* get logical blk addr */
-#define	MTIOCRDHPOS	_IOR('m', 6, u_int32_t)	/* get hardware blk addr */
-#define	MTIOCSLOCATE	_IOW('m', 5, u_int32_t)	/* seek to logical blk addr */
-#define	MTIOCHLOCATE	_IOW('m', 6, u_int32_t)	/* seek to hardware blk addr */
+#define	MTIOCRDSPOS	_IOR('m', 5, uint32_t)	/* get logical blk addr */
+#define	MTIOCRDHPOS	_IOR('m', 6, uint32_t)	/* get hardware blk addr */
+#define	MTIOCSLOCATE	_IOW('m', 5, uint32_t)	/* seek to logical blk addr */
+#define	MTIOCHLOCATE	_IOW('m', 6, uint32_t)	/* seek to hardware blk addr */
 #define	MTIOCERRSTAT	_IOR('m', 7, union mterrstat)	/* get tape errors */
 /*
  * Set EOT model- argument is number of filemarks to end a tape with.
  * Note that not all possible values will be accepted.
  */
-#define	MTIOCSETEOTMODEL	_IOW('m', 8, u_int32_t)
+#define	MTIOCSETEOTMODEL	_IOW('m', 8, uint32_t)
 /* Get current EOT model */
-#define	MTIOCGETEOTMODEL	_IOR('m', 8, u_int32_t)
+#define	MTIOCGETEOTMODEL	_IOR('m', 8, uint32_t)
 
 #ifndef _KERNEL
 #define	DEFTAPE	"/dev/nsa0"
diff --git a/share/man/man4/natm.4 b/share/man/man4/natm.4
index 59e5559d3..a553f6e 100644
--- a/share/man/man4/natm.4
+++ b/share/man/man4/natm.4
@@ -23,11 +23,11 @@ The NATM layer uses a
 to specify a virtual circuit:
 .Bd -literal -offset indent
 struct sockaddr_natm {
-  u_int8_t      snatm_len;              /* length */
-  u_int8_t      snatm_family;           /* AF_NATM */
+  uint8_t       snatm_len;              /* length */
+  uint8_t       snatm_family;           /* AF_NATM */
   char          snatm_if[IFNAMSIZ];     /* interface name */
-  u_int16_t     snatm_vci;              /* vci */
-  u_int8_t      snatm_vpi;              /* vpi */
+  uint16_t      snatm_vci;              /* vci */
+  uint8_t       snatm_vpi;              /* vpi */
 };
 .Ed
 .Pp
diff --git a/share/man/man4/net80211.4 b/share/man/man4/net80211.4
index 693f6b9..1af240d 100644
--- a/share/man/man4/net80211.4
+++ b/share/man/man4/net80211.4
@@ -64,7 +64,7 @@ This structure is defined as follows:
 .Bd -literal
 struct ieee80211req {
 	char		i_name[IFNAMSIZ];	/* if_name, e.g. "wi0" */
-	u_int16_t	i_type;			/* req type */
+	uint16_t	i_type;			/* req type */
 	int16_t		i_val;			/* Index or simple value */
 	int16_t		i_len;			/* Index or simple value */
 	void		*i_data;		/* Extra data */
diff --git a/share/man/man4/ng_async.4 b/share/man/man4/ng_async.4
index bb6b0be..2349cb3 100644
--- a/share/man/man4/ng_async.4
+++ b/share/man/man4/ng_async.4
@@ -118,9 +118,9 @@ Sets the node configuration, which is described by a
 .Bd -literal -offset 4n
 struct ng_async_cfg {
   u_char    enabled;  /* Turn encoding on/off */
-  u_int16_t amru;     /* Max receive async frame len */
-  u_int16_t smru;     /* Max receive sync frame len */
-  u_int32_t accm;     /* ACCM encoding */
+  uint16_t  amru;     /* Max receive async frame len */
+  uint16_t  smru;     /* Max receive sync frame len */
+  uint32_t  accm;     /* ACCM encoding */
 };
 .Ed
 .Pp
diff --git a/share/man/man4/ng_bridge.4 b/share/man/man4/ng_bridge.4
index 8884e33..b00dc60 100644
--- a/share/man/man4/ng_bridge.4
+++ b/share/man/man4/ng_bridge.4
@@ -108,9 +108,9 @@ as an argument:
 struct ng_bridge_config {
   u_char      ipfw[NG_BRIDGE_MAX_LINKS]; /* enable ipfw */
   u_char      debugLevel;           /* debug level */
-  u_int32_t   loopTimeout;          /* link loopback mute time */
-  u_int32_t   maxStaleness;         /* max host age before nuking */
-  u_int32_t   minStableAge;         /* min time for a stable host */
+  uint32_t    loopTimeout;          /* link loopback mute time */
+  uint32_t    maxStaleness;         /* max host age before nuking */
+  uint32_t    minStableAge;         /* min time for a stable host */
 };
 .Ed
 .Pp
@@ -155,20 +155,20 @@ currently connected:
 .Bd -literal -offset 0n
 /* Statistics structure (one for each link) */
 struct ng_bridge_link_stats {
-  u_int64_t   recvOctets;     /* total octets rec'd on link */
-  u_int64_t   recvPackets;    /* total pkts rec'd on link */
-  u_int64_t   recvMulticasts; /* multicast pkts rec'd on link */
-  u_int64_t   recvBroadcasts; /* broadcast pkts rec'd on link */
-  u_int64_t   recvUnknown;    /* pkts rec'd with unknown dest addr */
-  u_int64_t   recvRunts;      /* pkts rec'd less than 14 bytes */
-  u_int64_t   recvInvalid;    /* pkts rec'd with bogus source addr */
-  u_int64_t   xmitOctets;     /* total octets xmit'd on link */
-  u_int64_t   xmitPackets;    /* total pkts xmit'd on link */
-  u_int64_t   xmitMulticasts; /* multicast pkts xmit'd on link */
-  u_int64_t   xmitBroadcasts; /* broadcast pkts xmit'd on link */
-  u_int64_t   loopDrops;      /* pkts dropped due to loopback */
-  u_int64_t   loopDetects;    /* number of loop detections */
-  u_int64_t   memoryFailures; /* times couldn't get mem or mbuf */
+  uint64_t   recvOctets;     /* total octets rec'd on link */
+  uint64_t   recvPackets;    /* total pkts rec'd on link */
+  uint64_t   recvMulticasts; /* multicast pkts rec'd on link */
+  uint64_t   recvBroadcasts; /* broadcast pkts rec'd on link */
+  uint64_t   recvUnknown;    /* pkts rec'd with unknown dest addr */
+  uint64_t   recvRunts;      /* pkts rec'd less than 14 bytes */
+  uint64_t   recvInvalid;    /* pkts rec'd with bogus source addr */
+  uint64_t   xmitOctets;     /* total octets xmit'd on link */
+  uint64_t   xmitPackets;    /* total pkts xmit'd on link */
+  uint64_t   xmitMulticasts; /* multicast pkts xmit'd on link */
+  uint64_t   xmitBroadcasts; /* broadcast pkts xmit'd on link */
+  uint64_t   loopDrops;      /* pkts dropped due to loopback */
+  uint64_t   loopDetects;    /* number of loop detections */
+  uint64_t   memoryFailures; /* times couldn't get mem or mbuf */
 };
 .Ed
 .It Dv NGM_BRIDGE_CLR_STATS
diff --git a/share/man/man4/ng_btsocket.4 b/share/man/man4/ng_btsocket.4
index 7db8178..22763f9 100644
--- a/share/man/man4/ng_btsocket.4
+++ b/share/man/man4/ng_btsocket.4
@@ -154,7 +154,7 @@ The Bluetooth L2CAP socket address is defined as follows:
 struct sockaddr_l2cap {
         u_char    l2cap_len;    /* total length */
         u_char    l2cap_family; /* address family */
-        u_int16_t l2cap_psm;    /* Protocol/Service Multiplexor */
+        uint16_t  l2cap_psm;    /* Protocol/Service Multiplexor */
         bdaddr_t  l2cap_bdaddr; /* address */
 };
 .Ed
@@ -272,7 +272,7 @@ struct sockaddr_rfcomm {
         u_char   rfcomm_len;     /* total length */
         u_char   rfcomm_family;  /* address family */
         bdaddr_t rfcomm_bdaddr;  /* address */
-        u_int8_t rfcomm_channel; /* channel */
+        uint8_t  rfcomm_channel; /* channel */
 };
 .Ed
 .Ss Dv SOCK_STREAM Ss RFCOMM sockets
diff --git a/share/man/man4/ng_car.4 b/share/man/man4/ng_car.4
index a536fb7..080986e 100644
--- a/share/man/man4/ng_car.4
+++ b/share/man/man4/ng_car.4
@@ -123,15 +123,15 @@ Return current node configuration as
 .Vt "struct ng_car_bulkconf"
 .Bd -literal
 struct ng_car_hookconf {
-	u_int64_t cbs;		/* Committed burst size */
-	u_int64_t ebs;		/* Exceeded/Peak burst size */
-	u_int64_t cir;		/* Committed information rate */
-	u_int64_t pir;		/* Peak information rate */
-	u_int8_t green_action;	/* Action for green packets */
-	u_int8_t yellow_action;	/* Action for yellow packets */
-	u_int8_t red_action;	/* Action for red packets */
-	u_int8_t mode;		/* operation mode */
-	u_int8_t opt;		/* mode options */
+	uint64_t cbs;		/* Committed burst size */
+	uint64_t ebs;		/* Exceeded/Peak burst size */
+	uint64_t cir;		/* Committed information rate */
+	uint64_t pir;		/* Peak information rate */
+	uint8_t  green_action;	/* Action for green packets */
+	uint8_t  yellow_action;	/* Action for yellow packets */
+	uint8_t  red_action;	/* Action for red packets */
+	uint8_t  mode;		/* operation mode */
+	uint8_t  opt;		/* mode options */
 };
 
 /* possible actions (..._action) */
@@ -161,12 +161,12 @@ Return node statistics as
 .Vt "struct ng_car_bulkstats"
 .Bd -literal
 struct ng_car_hookstats {
-	u_int64_t passed_pkts;
-	u_int64_t droped_pkts;
-	u_int64_t green_pkts;
-	u_int64_t yellow_pkts;
-	u_int64_t red_pkts;
-	u_int64_t errors;
+	uint64_t passed_pkts;
+	uint64_t droped_pkts;
+	uint64_t green_pkts;
+	uint64_t yellow_pkts;
+	uint64_t red_pkts;
+	uint64_t errors;
 };
 
 struct ng_car_bulkstats {
diff --git a/share/man/man4/ng_ccatm.4 b/share/man/man4/ng_ccatm.4
index 3a9e121..1010c0f 100644
--- a/share/man/man4/ng_ccatm.4
+++ b/share/man/man4/ng_ccatm.4
@@ -110,7 +110,7 @@ The interface on these hooks is defined in
 and uses a structure
 .Bd -literal
 struct ccatm_op {
-	u_int32_t	op;	/* request code */
+	uint32_t	op;	/* request code */
 	u_char		data[];	/* optional data */
 };
 .Ed
@@ -230,7 +230,7 @@ struct ngm_ccatm_get_addresses {
 	struct ngm_ccatm_address_req addr[0];
 };
 struct ngm_ccatm_address_req {
-	u_int32_t	port;
+	uint32_t	port;
 	struct uni_addr	addr;
 };
 .Ed
diff --git a/share/man/man4/ng_cisco.4 b/share/man/man4/ng_cisco.4
index d2b382f..e4300a0 100644
--- a/share/man/man4/ng_cisco.4
+++ b/share/man/man4/ng_cisco.4
@@ -148,8 +148,8 @@ Returns a
 .Dv "struct ngciscostat" :
 .Bd -literal -offset 4n
 struct ngciscostat {
-  u_int32_t   seq_retries;       /* # unack'd retries */
-  u_int32_t   keepalive_period;  /* in seconds */
+  uint32_t   seq_retries;       /* # unack'd retries */
+  uint32_t   keepalive_period;  /* in seconds */
 };
 .Ed
 .El
diff --git a/share/man/man4/ng_etf.4 b/share/man/man4/ng_etf.4
index 18bb99e..bc42726 100644
--- a/share/man/man4/ng_etf.4
+++ b/share/man/man4/ng_etf.4
@@ -102,7 +102,7 @@ are specified in a structure of type
 .Bd -literal -offset 4n
 struct ng_etffilter {
         char       matchhook[NG_HOOKSIZ];     /* hook name */
-        u_int16_t  ethertype;	              /* catch these */
+        uint16_t   ethertype;	              /* catch these */
 };
 .Ed
 .El
diff --git a/share/man/man4/ng_hci.4 b/share/man/man4/ng_hci.4
index 28de180..0234d41 100644
--- a/share/man/man4/ng_hci.4
+++ b/share/man/man4/ng_hci.4
@@ -133,9 +133,9 @@ The next sections specify the HCI packet formats.
 .Bd -literal -offset indent
 #define NG_HCI_CMD_PKT 0x01
 typedef struct {
-        u_int8_t  type;   /* MUST be 0x1 */
-        u_int16_t opcode; /* OpCode */
-        u_int8_t  length; /* parameter(s) length in bytes */
+        uint8_t  type;   /* MUST be 0x1 */
+        uint16_t opcode; /* OpCode */
+        uint8_t  length; /* parameter(s) length in bytes */
 } __attribute__ ((packed)) ng_hci_cmd_pkt_t;
 .Ed
 .Pp
@@ -156,9 +156,9 @@ Controller to the Host.
 .Bd -literal -offset indent
 #define NG_HCI_EVENT_PKT 0x04
 typedef struct {
-        u_int8_t type;   /* MUST be 0x4 */
-        u_int8_t event;  /* event */
-        u_int8_t length; /* parameter(s) length in bytes */
+        uint8_t type;   /* MUST be 0x4 */
+        uint8_t event;  /* event */
+        uint8_t length; /* parameter(s) length in bytes */
 } __attribute__ ((packed)) ng_hci_event_pkt_t;
 .Ed
 .Pp
@@ -168,9 +168,9 @@ when events occur.
 .Bd -literal -offset indent
 #define NG_HCI_ACL_DATA_PKT 0x02
 typedef struct {
-        u_int8_t  type;       /* MUST be 0x2 */
-        u_int16_t con_handle; /* connection handle + PB + BC flags */
-        u_int16_t length;     /* payload length in bytes */
+        uint8_t  type;       /* MUST be 0x2 */
+        uint16_t con_handle; /* connection handle + PB + BC flags */
+        uint16_t length;     /* payload length in bytes */
 } __attribute__ ((packed)) ng_hci_acldata_pkt_t;
 .Ed
 .Pp
@@ -180,9 +180,9 @@ Host Controller.
 .Bd -literal -offset indent
 #define NG_HCI_SCO_DATA_PKT 0x03
 typedef struct {
-        u_int8_t  type;       /* MUST be 0x3 */
-        u_int16_t con_handle; /* connection handle + reserved bits */
-        u_int8_t  length;     /* payload length in bytes */
+        uint8_t  type;       /* MUST be 0x3 */
+        uint16_t con_handle; /* connection handle + reserved bits */
+        uint8_t  length;     /* payload length in bytes */
 } __attribute__ ((packed)) ng_hci_scodata_pkt_t;
 .Ed
 .Pp
@@ -216,9 +216,9 @@ Netgraph message defined as follows.
 .Bd -literal -offset indent
 #define NGM_HCI_NODE_UP 112 /* HCI -> Upper */
 typedef struct {
-        u_int16_t pkt_size; /* max. ACL/SCO packet size (w/o hdr) */
-        u_int16_t num_pkts; /* ACL/SCO packet queue size */
-        u_int16_t reserved; /* place holder */
+        uint16_t  pkt_size; /* max. ACL/SCO packet size (w/o hdr) */
+        uint16_t  num_pkts; /* ACL/SCO packet queue size */
+        uint16_t  reserved; /* place holder */
         bdaddr_t  bdaddr;   /* bdaddr */
 } ng_hci_node_up_ep;
 .Ed
@@ -244,8 +244,8 @@ Netgraph message is defined as follows.
 .Bd -literal -offset indent
 #define NGM_HCI_SYNC_CON_QUEUE 113 /* HCI -> Upper */
 typedef struct {
-        u_int16_t con_handle; /* connection handle */
-        u_int16_t completed;  /* number of completed packets */
+        uint16_t con_handle; /* connection handle */
+        uint16_t completed;  /* number of completed packets */
 } ng_hci_sync_con_queue_ep;
 .Ed
 .Sh HOOKS
diff --git a/share/man/man4/ng_l2cap.4 b/share/man/man4/ng_l2cap.4
index d4b7815..949b039 100644
--- a/share/man/man4/ng_l2cap.4
+++ b/share/man/man4/ng_l2cap.4
@@ -310,9 +310,9 @@ appropriate upstream hook and must be prepended with header defined as follows.
 .Bd -literal -offset indent
 /* L2CA data packet header */
 typedef struct {
-        u_int32_t token;  /* token to use in L2CAP_L2CA_WRITE */
-        u_int16_t length; /* length of the data */
-        u_int16_t lcid;   /* local channel ID */
+        uint32_t token;  /* token to use in L2CAP_L2CA_WRITE */
+        uint16_t length; /* length of the data */
+        uint16_t lcid;   /* local channel ID */
 } __attribute__ ((packed)) ng_l2cap_l2ca_hdr_t;
 .Ed
 .Pp
diff --git a/share/man/man4/ng_l2tp.4 b/share/man/man4/ng_l2tp.4
index 49fedf1..c556a49 100644
--- a/share/man/man4/ng_l2tp.4
+++ b/share/man/man4/ng_l2tp.4
@@ -115,11 +115,11 @@ as an argument:
 struct ng_l2tp_config {
     u_char      enabled;        /* enables traffic flow */
     u_char      match_id;       /* tunnel id must match 'tunnel_id' */
-    u_int16_t   tunnel_id;      /* local tunnel id */
-    u_int16_t   peer_id;        /* peer's tunnel id */
-    u_int16_t   peer_win;       /* peer's max recv window size */
-    u_int16_t   rexmit_max;     /* max retransmits before failure */
-    u_int16_t   rexmit_max_to;  /* max delay between retransmits */
+    uint16_t    tunnel_id;      /* local tunnel id */
+    uint16_t    peer_id;        /* peer's tunnel id */
+    uint16_t    peer_win;       /* peer's max recv window size */
+    uint16_t    rexmit_max;     /* max retransmits before failure */
+    uint16_t    rexmit_max_to;  /* max delay between retransmits */
 };
 .Ed
 .Pp
@@ -197,8 +197,8 @@ The argument is a
 .Bd -literal
 /* Configuration for a session hook */
 struct ng_l2tp_sess_config {
-    u_int16_t   session_id;     /* local session id */
-    u_int16_t   peer_id;        /* peer's session id */
+    uint16_t    session_id;     /* local session id */
+    uint16_t    peer_id;        /* peer's session id */
     u_char      control_dseq;   /* we control data sequencing? */
     u_char      enable_dseq;    /* enable data sequencing? */
     u_char      include_length; /* include length field? */
diff --git a/share/man/man4/ng_mppc.4 b/share/man/man4/ng_mppc.4
index a146228..df3b3a7 100644
--- a/share/man/man4/ng_mppc.4
+++ b/share/man/man4/ng_mppc.4
@@ -106,7 +106,7 @@ as an argument:
 /* Configuration for a session */
 struct ng_mppc_config {
     u_char    enable;                 /* enable */
-    u_int32_t bits;                   /* config bits */
+    uint32_t  bits;                   /* config bits */
     u_char    startkey[MPPE_KEY_LEN]; /* start key */
 };
 
diff --git a/share/man/man4/ng_netflow.4 b/share/man/man4/ng_netflow.4
index 914489b..ff54fc6 100644
--- a/share/man/man4/ng_netflow.4
+++ b/share/man/man4/ng_netflow.4
@@ -148,8 +148,8 @@ This message requires
 as an argument:
 .Bd -literal -offset 4n
 struct ng_netflow_setifindex {
-	u_int16_t iface;	/* which iface to operate on */
-	u_int16_t index;	/* new index */
+	uint16_t iface;		/* which iface to operate on */
+	uint16_t index;		/* new index */
 };
 .Ed
 .Pp
@@ -175,8 +175,8 @@ This message requires
 as an argument:
 .Bd -literal -offset 4n
 struct ng_netflow_setconfig {
-	u_int16_t iface;
-	u_int32_t conf;
+	uint16_t iface;
+	uint32_t conf;
 #define NG_NETFLOW_CONF_INGRESS		1
 #define NG_NETFLOW_CONF_EGRESS		2
 #define NG_NETFLOW_CONF_ONCE		4
diff --git a/share/man/man4/ng_one2many.4 b/share/man/man4/ng_one2many.4
index 434ea73..948b763 100644
--- a/share/man/man4/ng_one2many.4
+++ b/share/man/man4/ng_one2many.4
@@ -156,8 +156,8 @@ as the control message argument:
 .Bd -literal
 /* Node configuration structure */
 struct ng_one2many_config {
-  u_int32_t   xmitAlg;        /* how to distribute packets */
-  u_int32_t   failAlg;        /* how to detect link failure */
+  uint32_t    xmitAlg;        /* how to distribute packets */
+  uint32_t    failAlg;        /* how to detect link failure */
   u_char      enabledLinks[NG_ONE2MANY_MAX_LINKS];
 };
 .Ed
@@ -187,10 +187,10 @@ link, which may or may not be currently connected:
 .Bd -literal
 /* Statistics structure (one for each link) */
 struct ng_one2many_link_stats {
-  u_int64_t   recvOctets;     /* total octets rec'd on link */
-  u_int64_t   recvPackets;    /* total pkts rec'd on link */
-  u_int64_t   xmitOctets;     /* total octets xmit'd on link */
-  u_int64_t   xmitPackets;    /* total pkts xmit'd on link */
+  uint64_t   recvOctets;     /* total octets rec'd on link */
+  uint64_t   recvPackets;    /* total pkts rec'd on link */
+  uint64_t   xmitOctets;     /* total octets xmit'd on link */
+  uint64_t   xmitPackets;    /* total pkts xmit'd on link */
 };
 .Ed
 .Pp
diff --git a/share/man/man4/ng_ppp.4 b/share/man/man4/ng_ppp.4
index 9fd72ca..453d1bd 100644
--- a/share/man/man4/ng_ppp.4
+++ b/share/man/man4/ng_ppp.4
@@ -355,14 +355,14 @@ struct ng_ppp_link_conf {
   u_char    enableLink;     /* enable this link */
   u_char    enableProtoComp;/* enable protocol field compression */
   u_char    enableACFComp;  /* enable addr/ctrl field compression */
-  u_int16_t mru;            /* peer MRU */
-  u_int32_t latency;        /* link latency (in milliseconds) */
-  u_int32_t bandwidth;      /* link bandwidth (in bytes/second) */
+  uint16_t  mru;            /* peer MRU */
+  uint32_t  latency;        /* link latency (in milliseconds) */
+  uint32_t  bandwidth;      /* link bandwidth (in bytes/second) */
 };
 
 /* Bundle config structure */
 struct ng_ppp_bund_conf {
-  u_int16_t mrru;                   /* multilink peer MRRU */
+  uint16_t  mrru;                   /* multilink peer MRRU */
   u_char    enableMultilink;        /* enable multilink */
   u_char    recvShortSeq;           /* recv multilink short seq # */
   u_char    xmitShortSeq;           /* xmit multilink short seq # */
diff --git a/share/man/man4/ng_pppoe.4 b/share/man/man4/ng_pppoe.4
index 32efa69..e7a9939 100644
--- a/share/man/man4/ng_pppoe.4
+++ b/share/man/man4/ng_pppoe.4
@@ -148,7 +148,7 @@ The three commands above use a common data structure:
 .Bd -literal -offset 4n
 struct ngpppoe_init_data {
     char       hook[NG_HOOKSIZ];       /* hook to monitor on */
-    u_int16_t  data_len;               /* service name length */
+    uint16_t   data_len;               /* service name length */
     char       data[0];                /* init data goes here */
 };
 .Ed
@@ -345,8 +345,8 @@ setup(char *ethername, char *service, char *sessname,
 	 * The following is available about the node:
 	 * ninfo->name		(string)
 	 * ninfo->type		(string)
-	 * ninfo->id		(u_int32_t)
-	 * ninfo->hooks		(u_int32_t) (count of hooks)
+	 * ninfo->id		(uint32_t)
+	 * ninfo->hooks		(uint32_t) (count of hooks)
 	 * check it is the correct type. and get it's ID for use
 	 * with mkpeer later.
 	 */
@@ -366,8 +366,8 @@ setup(char *ethername, char *service, char *sessname,
 		 * link->peerhook	(string)
 		 * peer->name		(string)
 		 * peer->type		(string)
-		 * peer->id		(u_int32_t)
-		 * peer->hooks		(u_int32_t)
+		 * peer->id		(uint32_t)
+		 * peer->hooks		(uint32_t)
 		 */
 		link = &hlist->link[k];
 		peer = &hlist->link[k].nodeinfo;
diff --git a/share/man/man4/ng_pptpgre.4 b/share/man/man4/ng_pptpgre.4
index 89557dc..e0d41f1 100644
--- a/share/man/man4/ng_pptpgre.4
+++ b/share/man/man4/ng_pptpgre.4
@@ -97,10 +97,10 @@ struct ng_pptpgre_conf {
     u_char      enableDelayedAck; /* enables delayed acks */
     u_char      enableAlwaysAck;  /* always send ack with data */
     u_char      enableWindowing;  /* enable windowing algorithm */
-    u_int16_t   cid;              /* my call id */
-    u_int16_t   peerCid;          /* peer call id */
-    u_int16_t   recvWin;          /* peer recv window size */
-    u_int16_t   peerPpd;          /* peer packet processing delay
+    uint16_t    cid;              /* my call id */
+    uint16_t    peerCid;          /* peer call id */
+    uint16_t    recvWin;          /* peer recv window size */
+    uint16_t    peerPpd;          /* peer packet processing delay
                                      (in 1/10 of a second) */
 };
 .Ed
diff --git a/share/man/man4/ppi.4 b/share/man/man4/ppi.4
index a6041d2..a4084ad 100644
--- a/share/man/man4/ppi.4
+++ b/share/man/man4/ppi.4
@@ -53,7 +53,7 @@ interface is performed using
 .Fn ioctl
 calls.
 Each command takes a single
-.Ft u_int8_t
+.Ft uint8_t
 argument, transferring one byte of data.
 The following commands are available:
 .Bl -tag -width indent
@@ -85,7 +85,7 @@ again, the following code fragment can be used:
 .Bd -literal -compact
 
 	int		fd;
-	u_int8_t	val;
+	uint8_t		val;
 
 	val = 0x5a;
 	ioctl(fd, PPISDATA, &val);