Author: luigi
Date: Thu Jul 15 14:43:12 2010
New Revision: 210123
URL: http://svn.freebsd.org/changeset/base/210123
Log:
remove some conditional #ifdefs (no-op on FreeBSD);
run the timer routine on cpu 0.
Modified:
head/sys/netinet/ipfw/ip_fw_dynamic.c
Modified: head/sys/netinet/ipfw/ip_fw_dynamic.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw_dynamic.c Thu Jul 15 14:41:59 2010
(r210122)
+++ head/sys/netinet/ipfw/ip_fw_dynamic.c Thu Jul 15 14:43:12 2010
(r210123)
@@ -894,10 +894,7 @@ struct mbuf *
ipfw_send_pkt(struct mbuf *replyto, struct ipfw_flow_id *id, u_int32_t seq,
u_int32_t ack, int flags)
{
-#ifndef __FreeBSD__
- return NULL;
-#else
- struct mbuf *m;
+ struct mbuf *m = NULL; /* stupid compiler */
int len, dir;
struct ip *h = NULL; /* stupid compiler */
#ifdef INET6
@@ -1033,7 +1030,6 @@ ipfw_send_pkt(struct mbuf *replyto, stru
}
return (m);
-#endif /* __FreeBSD__ */
}
/*
@@ -1131,8 +1127,8 @@ ipfw_tick(void * vnetx)
}
#endif
done:
- callout_reset(&V_ipfw_timeout, V_dyn_keepalive_period * hz,
- ipfw_tick, vnetx);
+ callout_reset_on(&V_ipfw_timeout, V_dyn_keepalive_period * hz,
+ ipfw_tick, vnetx, 0);
CURVNET_RESTORE();
}
@@ -1173,7 +1169,7 @@ ipfw_dyn_init(void)
V_dyn_max = 4096; /* max # of dynamic rules */
callout_init(&V_ipfw_timeout, CALLOUT_MPSAFE);
- callout_reset(&V_ipfw_timeout, hz, ipfw_tick, curvnet);
+ callout_reset_on(&V_ipfw_timeout, hz, ipfw_tick, curvnet, 0);
}
void
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
