i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.haiku-os.org/haiku

Browse Source
This commit is contained in:
Adrien Destugues - PulkoMandy
2012-07-18 18:12:41 +02:00
parent c9f321ebc7 a2e7d8df7b
commit 8c115d4c5f
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/compat/freebsd_network/callout.cpp
+5 -5
View File
@@ -172,7 +172,7 @@ callout_init_mtx(struct callout *c, struct mtx *mtx, int flags)
int
callout_reset(struct callout *c, int when, void (*func)(void *), void *arg)
callout_reset(struct callout *c, int ticks, void (*func)(void *), void *arg)
{
int canceled = callout_stop(c);
@@ -183,12 +183,12 @@ callout_reset(struct callout *c, int when, void (*func)(void *), void *arg)
TRACE("callout_reset %p, func %p, arg %p\n", c, c->c_func, c->c_arg);
if (when >= 0) {
if (ticks >= 0) {
// reschedule or add this timer
if (c->due <= 0)
list_add_item(&sTimers, c);
c->due = system_time() + when;
c->due = system_time() + ticks_to_usecs(ticks);
// notify timer about the change if necessary
if (sTimeout > c->due)
@@ -200,9 +200,9 @@ callout_reset(struct callout *c, int when, void (*func)(void *), void *arg)
int
callout_schedule(struct callout *callout, int toTicks)
callout_schedule(struct callout *callout, int ticks)
{
return callout_reset(callout, toTicks, callout->c_func, callout->c_arg);
return callout_reset(callout, ticks, callout->c_func, callout->c_arg);
}
src/libs/compat/freebsd_network/compat/sys/callout.h
+3 -2
View File
@@ -30,8 +30,9 @@ struct callout {
void callout_init(struct callout *c, int mpsafe);
void callout_init_mtx(struct callout *c, struct mtx *mutex, int flags);
int callout_schedule(struct callout *c, int when);
int callout_reset(struct callout *c, int when, void (*func)(void *), void *arg);
/* Time values are in ticks, see compat/sys/kernel.h for its definition */
int callout_schedule(struct callout *c, int ticks);
int callout_reset(struct callout *c, int ticks, void (*func)(void *), void *arg);
int callout_pending(struct callout *c);
int callout_active(struct callout *c);
src/libs/compat/freebsd_wlan/net80211/Jamfile
+2 -2
View File
@@ -11,9 +11,9 @@ UsePrivateKernelHeaders ;
Includes [ FGristFiles kernel_c++_structs.h ]
: <src!system!kernel>kernel_c++_struct_sizes.h ;
SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 IEEE80211_DEBUG=1 ]
SubDirCcFlags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ]
-Wno-format -Wno-unused -Wno-uninitialized ;
SubDirC++Flags [ FDefines _KERNEL=1 FBSD_DRIVER=1 IEEE80211_DEBUG=1 ]
SubDirC++Flags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ]
-Wno-format -Wno-unused -Wno-uninitialized ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) .. crypto rijndael ] ;
src/libs/compat/freebsd_wlan/net80211/ieee80211_haiku.cpp
-1
View File
@@ -539,7 +539,6 @@ ieee80211_sysctl_vattach(struct ieee80211vap* vap)
| IEEE80211_MSG_NODE
| IEEE80211_MSG_ASSOC
| IEEE80211_MSG_AUTH
| IEEE80211_MSG_SCAN
| IEEE80211_MSG_STATE
| IEEE80211_MSG_POWER
| IEEE80211_MSG_WME