diff options
author | jake <jake@FreeBSD.org> | 2000-05-23 20:41:01 +0000 |
---|---|---|
committer | jake <jake@FreeBSD.org> | 2000-05-23 20:41:01 +0000 |
commit | d93fbc99166053b75c2eeb69b5cb603cfaf79ec0 (patch) | |
tree | a4f130be4544ce7cfe4afa8c93f996b871433cb8 /sys/netinet | |
parent | e814d2a0db522b0f163eef55a56d05aa226951f3 (diff) | |
download | FreeBSD-src-d93fbc99166053b75c2eeb69b5cb603cfaf79ec0.zip FreeBSD-src-d93fbc99166053b75c2eeb69b5cb603cfaf79ec0.tar.gz |
Change the way that the queue(3) structures are declared; don't assume that
the type argument to *_HEAD and *_ENTRY is a struct.
Suggested by: phk
Reviewed by: phk
Approved by: mdodd
Diffstat (limited to 'sys/netinet')
-rw-r--r-- | sys/netinet/if_ether.c | 4 | ||||
-rw-r--r-- | sys/netinet/in_pcb.h | 12 | ||||
-rw-r--r-- | sys/netinet/in_var.h | 8 | ||||
-rw-r--r-- | sys/netinet/ip_dummynet.c | 2 | ||||
-rw-r--r-- | sys/netinet/ip_flow.c | 2 | ||||
-rw-r--r-- | sys/netinet/ip_flow.h | 2 | ||||
-rw-r--r-- | sys/netinet/ip_fw.c | 2 | ||||
-rw-r--r-- | sys/netinet/ip_fw.h | 2 | ||||
-rw-r--r-- | sys/netinet/tcp_var.h | 4 |
9 files changed, 19 insertions, 19 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 1125455..3eac14a 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -87,14 +87,14 @@ SYSCTL_INT(_net_link_ether_inet, OID_AUTO, host_down_time, CTLFLAG_RW, #define rt_expire rt_rmx.rmx_expire struct llinfo_arp { - LIST_ENTRY(llinfo_arp) la_le; + LIST_ENTRY(struct llinfo_arp) la_le; struct rtentry *la_rt; struct mbuf *la_hold; /* last packet until resolved/timeout */ long la_asked; /* last time we QUERIED for this addr */ #define la_timer la_rt->rt_rmx.rmx_expire /* deletion time in seconds */ }; -static LIST_HEAD(, llinfo_arp) llinfo_arp; +static LIST_HEAD(, struct llinfo_arp) llinfo_arp; struct ifqueue arpintrq = {0, 0, 0, 50}; static int arp_inuse, arp_allocated; diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 08733ad..cc9527c 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -52,8 +52,8 @@ * up (to a socket structure) and down (to a protocol-specific) * control block. */ -LIST_HEAD(inpcbhead, inpcb); -LIST_HEAD(inpcbporthead, inpcbport); +LIST_HEAD(inpcbhead, struct inpcb); +LIST_HEAD(inpcbporthead, struct inpcbport); typedef u_quad_t inp_gen_t; /* @@ -75,10 +75,10 @@ struct in_addr_4in6 { struct icmp6_filter; struct inpcb { - LIST_ENTRY(inpcb) inp_hash; /* hash list */ + LIST_ENTRY(struct inpcb) inp_hash; /* hash list */ u_short inp_fport; /* foreign port */ u_short inp_lport; /* local port */ - LIST_ENTRY(inpcb) inp_list; /* list for all PCBs of this proto */ + LIST_ENTRY(struct inpcb) inp_list; /* list for all PCBs of this proto */ u_int32_t inp_flow; /* protocol dependent part, local and foreign addr */ @@ -140,7 +140,7 @@ struct inpcb { short inp6_hops; u_int8_t inp6_hlim; } inp_depend6; - LIST_ENTRY(inpcb) inp_portlist; + LIST_ENTRY(struct inpcb) inp_portlist; struct inpcbport *inp_phd; /* head of this list */ inp_gen_t inp_gencnt; /* generation count of this instance */ #define in6p_faddr inp_dependfaddr.inp6_foreign @@ -191,7 +191,7 @@ struct xinpgen { #endif /* _SYS_SOCKETVAR_H_ */ struct inpcbport { - LIST_ENTRY(inpcbport) phd_hash; + LIST_ENTRY(struct inpcbport) phd_hash; struct inpcbhead phd_pcblist; u_short phd_port; }; diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h index de2a6a6..f0cbab6 100644 --- a/sys/netinet/in_var.h +++ b/sys/netinet/in_var.h @@ -55,7 +55,7 @@ struct in_ifaddr { u_long ia_subnet; /* subnet number, including net */ u_long ia_subnetmask; /* mask of subnet part */ struct in_addr ia_netbroadcast; /* to recognize net broadcasts */ - TAILQ_ENTRY(in_ifaddr) ia_link; /* tailq macro glue */ + TAILQ_ENTRY(struct in_ifaddr) ia_link; /* tailq macro glue */ struct sockaddr_in ia_addr; /* reserve space for interface name */ struct sockaddr_in ia_dstaddr; /* reserve space for broadcast addr */ #define ia_broadaddr ia_dstaddr @@ -81,7 +81,7 @@ struct in_aliasreq { #ifdef _KERNEL -extern TAILQ_HEAD(in_ifaddrhead, in_ifaddr) in_ifaddrhead; +extern TAILQ_HEAD(in_ifaddrhead, struct in_ifaddr) in_ifaddrhead; extern struct ifqueue ipintrq; /* ip packet input queue */ extern struct in_addr zeroin_addr; extern u_char inetctlerrmap[]; @@ -147,7 +147,7 @@ struct router_info { * compatible with the rest of the world (see IN_FIRST_MULTI et al, below). */ struct in_multi { - LIST_ENTRY(in_multi) inm_link; /* queue macro glue */ + LIST_ENTRY(struct in_multi) inm_link; /* queue macro glue */ struct in_addr inm_addr; /* IP multicast address, convenience */ struct ifnet *inm_ifp; /* back pointer to ifnet */ struct ifmultiaddr *inm_ifma; /* back pointer to ifmultiaddr */ @@ -163,7 +163,7 @@ SYSCTL_DECL(_net_inet_ip); SYSCTL_DECL(_net_inet_raw); #endif -extern LIST_HEAD(in_multihead, in_multi) in_multihead; +extern LIST_HEAD(in_multihead, struct in_multi) in_multihead; /* * Structure used by macros below to remember position when stepping through diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c index 5f8c091..28be322 100644 --- a/sys/netinet/ip_dummynet.c +++ b/sys/netinet/ip_dummynet.c @@ -120,7 +120,7 @@ static void dummynet_flush(void); * ip_fw_chain is used when deleting a pipe, because ipfw rules can * hold references to the pipe. */ -extern LIST_HEAD (ip_fw_head, ip_fw_chain) ip_fw_chain; +extern LIST_HEAD (ip_fw_head, struct ip_fw_chain) ip_fw_chain; static void rt_unref(struct rtentry *rt) diff --git a/sys/netinet/ip_flow.c b/sys/netinet/ip_flow.c index 6c9119b..119dd59 100644 --- a/sys/netinet/ip_flow.c +++ b/sys/netinet/ip_flow.c @@ -59,7 +59,7 @@ #define IPFLOW_TIMER (5 * PR_SLOWHZ) #define IPFLOW_HASHBITS 6 /* should not be a multiple of 8 */ #define IPFLOW_HASHSIZE (1 << IPFLOW_HASHBITS) -static LIST_HEAD(ipflowhead, ipflow) ipflows[IPFLOW_HASHSIZE]; +static LIST_HEAD(ipflowhead, struct ipflow) ipflows[IPFLOW_HASHSIZE]; static int ipflow_inuse; #define IPFLOW_MAX 256 diff --git a/sys/netinet/ip_flow.h b/sys/netinet/ip_flow.h index 4675996..2e334af 100644 --- a/sys/netinet/ip_flow.h +++ b/sys/netinet/ip_flow.h @@ -40,7 +40,7 @@ #define _NETINET_IP_FLOW_H struct ipflow { - LIST_ENTRY(ipflow) ipf_next; /* next ipflow in bucket */ + LIST_ENTRY(struct ipflow) ipf_next; /* next ipflow in bucket */ struct in_addr ipf_dst; /* destination address */ struct in_addr ipf_src; /* source address */ diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c index 03deaa7..8e654e6 100644 --- a/sys/netinet/ip_fw.c +++ b/sys/netinet/ip_fw.c @@ -84,7 +84,7 @@ struct ipfw_flow_id last_pkt ; #define IPFW_DEFAULT_RULE ((u_int)(u_short)~0) -LIST_HEAD (ip_fw_head, ip_fw_chain) ip_fw_chain; +LIST_HEAD (ip_fw_head, struct ip_fw_chain) ip_fw_chain; MALLOC_DEFINE(M_IPFW, "IpFw/IpAcct", "IpFw/IpAcct chain's"); diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h index a106108..1609bd9 100644 --- a/sys/netinet/ip_fw.h +++ b/sys/netinet/ip_fw.h @@ -123,7 +123,7 @@ struct ip_fw_ext { /* extended structure */ #define fw_fwd_ip fw_un.fu_fwd_ip struct ip_fw_chain { - LIST_ENTRY(ip_fw_chain) chain; + LIST_ENTRY(struct ip_fw_chain) chain; struct ip_fw *rule; }; diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 5798c84..57e81a7 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -42,12 +42,12 @@ /* TCP segment queue entry */ struct tseg_qent { - LIST_ENTRY(tseg_qent) tqe_q; + LIST_ENTRY(struct tseg_qent) tqe_q; int tqe_len; /* TCP segment data length */ struct tcphdr *tqe_th; /* a pointer to tcp header */ struct mbuf *tqe_m; /* mbuf contains packet */ }; -LIST_HEAD(tsegqe_head, tseg_qent); +LIST_HEAD(tsegqe_head, struct tseg_qent); #ifdef MALLOC_DECLARE MALLOC_DECLARE(M_TSEGQ); #endif |