diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
| commit | 230e5ab6a084ed50470f101934782dbf54b0d06b (patch) | |
| tree | 5dd821c8d33f450470588e7a543f74bf74306e9e /include/net | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ipx.h | 18 | ||||
| -rw-r--r-- | include/net/snmp.h | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/include/net/ipx.h b/include/net/ipx.h index 374a899ba..ed7b7adbb 100644 --- a/include/net/ipx.h +++ b/include/net/ipx.h @@ -18,9 +18,9 @@ typedef struct { - unsigned long net; - unsigned char node[IPX_NODE_LEN]; - unsigned short sock; + __u32 net; + __u8 node[IPX_NODE_LEN]; + __u16 sock; } ipx_address; #define ipx_broadcast_node "\377\377\377\377\377\377" @@ -28,11 +28,11 @@ typedef struct struct ipxhdr { - unsigned short ipx_checksum __attribute__ ((packed)); + __u16 ipx_checksum __attribute__ ((packed)); #define IPX_NO_CHECKSUM 0xFFFF - unsigned short ipx_pktsize __attribute__ ((packed)); - unsigned char ipx_tctrl; - unsigned char ipx_type; + __u16 ipx_pktsize __attribute__ ((packed)); + __u8 ipx_tctrl; + __u8 ipx_type; #define IPX_TYPE_UNKNOWN 0x00 #define IPX_TYPE_RIP 0x01 /* may also be 0 */ #define IPX_TYPE_SAP 0x04 /* may also be 0 */ @@ -49,7 +49,7 @@ extern void ipxrtr_device_down(struct device *dev); typedef struct ipx_interface { /* IPX address */ - unsigned long if_netnum; + __u32 if_netnum; unsigned char if_node[IPX_NODE_LEN]; /* physical device info */ @@ -70,7 +70,7 @@ typedef struct ipx_interface { } ipx_interface; typedef struct ipx_route { - unsigned long ir_net; + __u32 ir_net; ipx_interface *ir_intrfc; unsigned char ir_routed; unsigned char ir_router_node[IPX_NODE_LEN]; diff --git a/include/net/snmp.h b/include/net/snmp.h index f8da9a0d4..ee3bf0e20 100644 --- a/include/net/snmp.h +++ b/include/net/snmp.h @@ -113,6 +113,8 @@ struct tcp_mib unsigned long TcpInSegs; unsigned long TcpOutSegs; unsigned long TcpRetransSegs; + unsigned long TcpInErrs; + unsigned long TcpOutRsts; }; struct udp_mib |