summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordarrenr <darrenr@FreeBSD.org>2004-05-02 15:10:17 +0000
committerdarrenr <darrenr@FreeBSD.org>2004-05-02 15:10:17 +0000
commita50f040209b29896936480421e97c9d7aa7827cc (patch)
tree86158f81af0d0492b730d1bef3c0a719df165f23
parent4e8ce3156b2e721b2f1cd4901ca3c5dd63dfd15b (diff)
downloadFreeBSD-src-a50f040209b29896936480421e97c9d7aa7827cc.zip
FreeBSD-src-a50f040209b29896936480421e97c9d7aa7827cc.tar.gz
Rename m_claim_next_hop() to m_claim_next(), as suggested by Max Laier.
-rw-r--r--sys/netinet/ip_input.c2
-rw-r--r--sys/netinet/ip_output.c2
-rw-r--r--sys/netinet/tcp_input.c2
-rw-r--r--sys/netinet/tcp_reass.c2
-rw-r--r--sys/sys/mbuf.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 063bfa4..baf4453 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -318,7 +318,7 @@ ip_input(struct mbuf *m)
M_ASSERTPKTHDR(m);
- args.next_hop = m_claim_next_hop(m, PACKET_TAG_IPFORWARD);
+ args.next_hop = m_claim_next(m, PACKET_TAG_IPFORWARD);
args.rule = ip_dn_claim_rule(m);
if (m->m_flags & M_FASTFWD_OURS) {
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 12fb495..f1f0acd 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -157,7 +157,7 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro,
M_ASSERTPKTHDR(m);
- args.next_hop = m_claim_next_hop(m, PACKET_TAG_IPFORWARD);
+ args.next_hop = m_claim_next(m, PACKET_TAG_IPFORWARD);
dummytag = m_tag_find(m, PACKET_TAG_DUMMYNET, NULL);
if (dummytag != NULL) {
struct dn_pkt_tag *dt = (struct dn_pkt_tag *)(dummytag+1);
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 967da22..6178bfb 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -445,7 +445,7 @@ tcp_input(m, off0)
#endif
/* Grab info from PACKET_TAG_IPFORWARD tag prepended to the chain. */
- next_hop = m_claim_next_hop(m, PACKET_TAG_IPFORWARD);
+ next_hop = m_claim_next(m, PACKET_TAG_IPFORWARD);
#ifdef INET6
isipv6 = (mtod(m, struct ip *)->ip_v == 6) ? 1 : 0;
#endif
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index 967da22..6178bfb 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -445,7 +445,7 @@ tcp_input(m, off0)
#endif
/* Grab info from PACKET_TAG_IPFORWARD tag prepended to the chain. */
- next_hop = m_claim_next_hop(m, PACKET_TAG_IPFORWARD);
+ next_hop = m_claim_next(m, PACKET_TAG_IPFORWARD);
#ifdef INET6
isipv6 = (mtod(m, struct ip *)->ip_v == 6) ? 1 : 0;
#endif
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 8668336..1ca9dbf 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -653,7 +653,7 @@ m_tag_find(struct mbuf *m, int type, struct m_tag *start)
* If a tag is present devalidate it also.
*/
static __inline struct sockaddr_in *
-m_claim_next_hop(struct mbuf *m, int type)
+m_claim_next(struct mbuf *m, int type)
{
struct m_tag *mtag = m_tag_find(m, type, NULL);
if (mtag) {
OpenPOWER on IntegriCloud