d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove some conditional #ifdefs (no-op on FreeBSD);

Browse Source 
run the timer routine on cpu 0.
This commit is contained in:
Luigi Rizzo 2010-07-15 14:43:12 +00:00
parent 1f6ad072ea
commit 71ad35a185
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/netinet/ipfw/ip_fw_dynamic.c
View File

@ -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, struct ipfw_flow_id *id, u_int32_t seq,
}
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