Hi,
ugly typo; anyone thinks this should survive to the upcoming release?
--
Martin Pelikan
Index: net/pf.c
===================================================================
RCS file: /cvs/src/sys/net/pf.c,v
retrieving revision 1.764
diff -u -p -r1.764 pf.c
--- net/pf.c 9 Jul 2011 17:42:19 -0000 1.764
+++ net/pf.c 22 Jul 2011 11:45:45 -0000
@@ -2592,7 +2592,7 @@ pf_get_mss(struct mbuf *m, int off, u_in
}
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_fam
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_fam
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;
Index: net/radix.c
===================================================================
RCS file: /cvs/src/sys/net/radix.c,v
retrieving revision 1.28
diff -u -p -r1.28 radix.c
--- net/radix.c 22 Aug 2010 17:02:04 -0000 1.28
+++ net/radix.c 22 Jul 2011 11:45:45 -0000
@@ -986,7 +986,7 @@ rn_walktree(struct radix_node_head *h, i
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;
Index: net/radix.h
===================================================================
RCS file: /cvs/src/sys/net/radix.h,v
retrieving revision 1.16
diff -u -p -r1.16 radix.h
--- net/radix.h 28 Jun 2010 18:50:37 -0000 1.16
+++ net/radix.h 22 Jul 2011 11:45:45 -0000
@@ -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
Index: net/route.c
===================================================================
RCS file: /cvs/src/sys/net/route.c,v
retrieving revision 1.131
diff -u -p -r1.131 route.c
--- net/route.c 4 Jul 2011 04:29:17 -0000 1.131
+++ net/route.c 22 Jul 2011 11:45:46 -0000
@@ -197,7 +197,7 @@ rtable_init(struct radix_node_head ***ta
for (i = 0; i < rtafidx_max; i++) {
if ((*table)[i] != NULL)
- (*table)[i]->rnh_rtabelid = id;
+ (*table)[i]->rnh_rtableid = id;
}
return (0);
