diff options
author | luigi <luigi@FreeBSD.org> | 2001-02-10 00:10:18 +0000 |
---|---|---|
committer | luigi <luigi@FreeBSD.org> | 2001-02-10 00:10:18 +0000 |
commit | bc66105b1dd64dd9599a78cd769be24fc39b89ea (patch) | |
tree | f2ecbab7993f781ecaad9607cce4fad0163a4001 /sys/netinet/ip_dummynet.c | |
parent | ca76da11764ea0bc1e044049f7a5c30eedfc8c7e (diff) | |
download | FreeBSD-src-bc66105b1dd64dd9599a78cd769be24fc39b89ea.zip FreeBSD-src-bc66105b1dd64dd9599a78cd769be24fc39b89ea.tar.gz |
Sync with the bridge/dummynet/ipfw code already tested in stable.
In ip_fw.[ch] change a couple of variable and field names to
avoid having types, variables and fields with the same name.
Diffstat (limited to 'sys/netinet/ip_dummynet.c')
-rw-r--r-- | sys/netinet/ip_dummynet.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c index c0d436e..8f69866 100644 --- a/sys/netinet/ip_dummynet.c +++ b/sys/netinet/ip_dummynet.c @@ -164,7 +164,7 @@ int if_tx_rdy(struct ifnet *ifp); * 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, ip_fw_chain) ip_fw_chain_head; static void rt_unref(struct rtentry *rt) @@ -453,7 +453,7 @@ transmit_event(struct dn_pipe *pipe) * (originally pkt->dn_m, but could be something else now) if * it has not consumed it. */ - m = bdg_forward(&m, eh, pkt->ifp); + m = bdg_forward(m, eh, pkt->ifp); if (m) m_freem(m); } @@ -1282,7 +1282,7 @@ dummynet_flush() s = splimp() ; /* remove all references to pipes ...*/ - for (chain= LIST_FIRST(&ip_fw_chain) ; chain; chain = LIST_NEXT(chain, chain)) + LIST_FOREACH(chain, &ip_fw_chain_head, next) chain->rule->pipe_ptr = NULL ; /* prevent future matches... */ p = all_pipes ; @@ -1658,7 +1658,7 @@ delete_pipe(struct dn_pipe *p) else a->next = b->next ; /* remove references to this pipe from the ip_fw rules. */ - for (chain = LIST_FIRST(&ip_fw_chain) ; chain; chain = LIST_NEXT(chain, chain)) + LIST_FOREACH(chain, &ip_fw_chain_head, next) if (chain->rule->pipe_ptr == &(b->fs)) chain->rule->pipe_ptr = NULL ; @@ -1692,7 +1692,7 @@ delete_pipe(struct dn_pipe *p) else a->next = b->next ; /* remove references to this flow_set from the ip_fw rules. */ - LIST_FOREACH(chain, &ip_fw_chain, chain) + LIST_FOREACH(chain, &ip_fw_chain_head, next) if (chain->rule->pipe_ptr == b) chain->rule->pipe_ptr = NULL ; |