summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2011-07-22 13:05:30 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2011-07-22 13:05:30 +0000
commit7e3a78952e5d11e7334e5fd34a3d9b44ef1a3b4f (patch)
tree1ae2a8e773e7ddaf78048c3038979b24ad36030c
parentf5cf5220cebac3a7fd9efbddab88a67a4f64cfcf (diff)
fix typos, martin pelikan
-rw-r--r--sys/net/pf.c8
-rw-r--r--sys/net/radix.c4
-rw-r--r--sys/net/radix.h4
-rw-r--r--sys/net/route.c4
4 files changed, 10 insertions, 10 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c
index d0ccad46a5a..28d2ee226d6 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.764 2011/07/09 17:42:19 bluhm Exp $ */
+/* $OpenBSD: pf.c,v 1.765 2011/07/22 13:05:29 henning Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -2592,7 +2592,7 @@ pf_get_mss(struct mbuf *m, int off, u_int16_t th_off, sa_family_t af)
}
u_int16_t
-pf_calc_mss(struct pf_addr *addr, sa_family_t af, int rtabelid, u_int16_t offer)
+pf_calc_mss(struct pf_addr *addr, sa_family_t af, int rtableid, u_int16_t offer)
{
#ifdef INET
struct sockaddr_in *dst;
@@ -2615,7 +2615,7 @@ pf_calc_mss(struct pf_addr *addr, sa_family_t af, int rtabelid, u_int16_t offer)
dst->sin_family = AF_INET;
dst->sin_len = sizeof(*dst);
dst->sin_addr = addr->v4;
- ro.ro_tableid = rtabelid;
+ ro.ro_tableid = rtableid;
rtalloc_noclone(&ro);
rt = ro.ro_rt;
break;
@@ -2628,7 +2628,7 @@ pf_calc_mss(struct pf_addr *addr, sa_family_t af, int rtabelid, u_int16_t offer)
dst6->sin6_family = AF_INET6;
dst6->sin6_len = sizeof(*dst6);
dst6->sin6_addr = addr->v6;
- ro6.ro_tableid = rtabelid;
+ ro6.ro_tableid = rtableid;
rtalloc_noclone((struct route *)&ro6);
rt = ro6.ro_rt;
break;
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 98e7273160c..b7be0e31e4e 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radix.c,v 1.28 2010/08/22 17:02:04 mpf Exp $ */
+/* $OpenBSD: radix.c,v 1.29 2011/07/22 13:05:29 henning Exp $ */
/* $NetBSD: radix.c,v 1.20 2003/08/07 16:32:56 agc Exp $ */
/*
@@ -986,7 +986,7 @@ rn_walktree(struct radix_node_head *h, int (*f)(struct radix_node *, void *,
while ((rn = base) != NULL) {
base = rn->rn_dupedkey;
if (!(rn->rn_flags & RNF_ROOT) &&
- (error = (*f)(rn, w, h->rnh_rtabelid)))
+ (error = (*f)(rn, w, h->rnh_rtableid)))
return (error);
}
rn = next;
diff --git a/sys/net/radix.h b/sys/net/radix.h
index fc7c867a05d..ced0ef7d916 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: radix.h,v 1.16 2010/06/28 18:50:37 claudio Exp $ */
+/* $OpenBSD: radix.h,v 1.17 2011/07/22 13:05:29 henning Exp $ */
/* $NetBSD: radix.h,v 1.8 1996/02/13 22:00:37 christos Exp $ */
/*
@@ -128,7 +128,7 @@ struct radix_node_head {
int (*)(struct radix_node *, void *, u_int), void *);
struct radix_node rnh_nodes[3];/* empty tree for common case */
int rnh_multipath; /* multipath? */
- u_int rnh_rtabelid;
+ u_int rnh_rtableid;
};
#ifdef _KERNEL
diff --git a/sys/net/route.c b/sys/net/route.c
index e928158718f..06fbeae54f8 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.c,v 1.131 2011/07/04 04:29:17 claudio Exp $ */
+/* $OpenBSD: route.c,v 1.132 2011/07/22 13:05:29 henning Exp $ */
/* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */
/*
@@ -197,7 +197,7 @@ rtable_init(struct radix_node_head ***table, u_int id)
for (i = 0; i < rtafidx_max; i++) {
if ((*table)[i] != NULL)
- (*table)[i]->rnh_rtabelid = id;
+ (*table)[i]->rnh_rtableid = id;
}
return (0);