mirrors
/
madwifi
mirror of https://github.com/proski/madwifi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation on sparc64 - tv_usec may be int, not long 

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@4026 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
proski 2009-05-24 01:21:48 +00:00
parent e846fff3ea
commit 1988f5f45e
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ath/if_ath.c
View File

@ -8747,7 +8747,7 @@ ath_chan_set(struct ath_softc *sc, struct ieee80211_channel *chan)
ath_hal_mhz2ieee(ah, hchan.channel, hchan.channelFlags), ath_hal_mhz2ieee(ah, hchan.channel, hchan.channelFlags),
hchan.channel, hchan.channel,
tv.tv_sec, tv.tv_sec,
tv.tv_usec (long)tv.tv_usec
); );
/* check if it is turbo mode switch */ /* check if it is turbo mode switch */
@ -8833,7 +8833,7 @@ ath_chan_set(struct ath_softc *sc, struct ieee80211_channel *chan)
"channel %u -- Time: %ld.%06ld\n", "channel %u -- Time: %ld.%06ld\n",
ieee80211_mhz2ieee(sc->sc_curchan.channel, ieee80211_mhz2ieee(sc->sc_curchan.channel,
sc->sc_curchan.channelFlags), sc->sc_curchan.channelFlags),
tv.tv_sec, tv.tv_usec); tv.tv_sec, (long)tv.tv_usec);
/* set the timeout to normal */ /* set the timeout to normal */
dev->watchdog_timeo = 120 * HZ; dev->watchdog_timeo = 120 * HZ;
/* Disable beacons and beacon miss interrupts */ /* Disable beacons and beacon miss interrupts */
@ -8863,7 +8863,7 @@ ath_chan_set(struct ath_softc *sc, struct ieee80211_channel *chan)
"%d -- Time: %ld.%06ld\n", "%d -- Time: %ld.%06ld\n",
ieee80211_mhz2ieee(sc->sc_curchan.channel, ieee80211_mhz2ieee(sc->sc_curchan.channel,
sc->sc_curchan.channelFlags), sc->sc_curchan.channelFlags),
tv.tv_sec, tv.tv_usec); tv.tv_sec, (long)tv.tv_usec);
return 0; return 0;
} }
@ -9378,7 +9378,7 @@ ath_dfs_cac_completed(unsigned long data )
"completed" : "not applicable", "completed" : "not applicable",
ieee80211_mhz2ieee(sc->sc_curchan.channel, ieee80211_mhz2ieee(sc->sc_curchan.channel,
sc->sc_curchan.channelFlags), sc->sc_curchan.channelFlags),
tv.tv_sec, tv.tv_usec); tv.tv_sec, (long)tv.tv_usec);
sc->sc_dfs_cac = 0; sc->sc_dfs_cac = 0;
if (sc->sc_curchan.privFlags & CHANNEL_INTERFERENCE) { if (sc->sc_curchan.privFlags & CHANNEL_INTERFERENCE) {
DPRINTF(sc, ATH_DEBUG_DOTH, DPRINTF(sc, ATH_DEBUG_DOTH,
@ -9410,7 +9410,7 @@ ath_dfs_cac_completed(unsigned long data )
DPRINTF(sc, ATH_DEBUG_STATE | ATH_DEBUG_DOTH, DPRINTF(sc, ATH_DEBUG_STATE | ATH_DEBUG_DOTH,
"VAP DFSWAIT_PENDING " "VAP DFSWAIT_PENDING "
"-> RUN -- Time: %ld.%06ld\n", "-> RUN -- Time: %ld.%06ld\n",
tv.tv_sec, tv.tv_usec); tv.tv_sec, (long)tv.tv_usec);
/* re alloc beacons to update new channel info */ /* re alloc beacons to update new channel info */
error = ath_beacon_alloc(sc, vap->iv_bss); error = ath_beacon_alloc(sc, vap->iv_bss);
if (error < 0) { if (error < 0) {
@ -9445,14 +9445,14 @@ ath_dfs_cac_completed(unsigned long data )
"indefinitely. dfs_testmode is " "indefinitely. dfs_testmode is "
"enabled. Waiting again. -- Time: " "enabled. Waiting again. -- Time: "
"%ld.%06ld\n", "%ld.%06ld\n",
tv.tv_sec, tv.tv_usec); tv.tv_sec, (long)tv.tv_usec);
mod_timer(&sc->sc_dfs_cac_timer, mod_timer(&sc->sc_dfs_cac_timer,
jiffies + (sc->sc_dfs_cac_period * HZ)); jiffies + (sc->sc_dfs_cac_period * HZ));
} else { } else {
DPRINTF(sc, ATH_DEBUG_STATE | ATH_DEBUG_DOTH, DPRINTF(sc, ATH_DEBUG_STATE | ATH_DEBUG_DOTH,
"VAP DFSWAIT_PENDING still. " "VAP DFSWAIT_PENDING still. "
"Waiting again. -- Time: %ld.%06ld\n", "Waiting again. -- Time: %ld.%06ld\n",
tv.tv_sec, tv.tv_usec); tv.tv_sec, (long)tv.tv_usec);
mod_timer(&sc->sc_dfs_cac_timer, mod_timer(&sc->sc_dfs_cac_timer,
jiffies + (ATH_DFS_WAIT_SHORT_POLL_PERIOD * HZ)); jiffies + (ATH_DFS_WAIT_SHORT_POLL_PERIOD * HZ));
} }
@ -12059,7 +12059,7 @@ ath_interrupt_dfs_cac(struct ath_softc *sc, const char *reason)
reason, reason,
ieee80211_mhz2ieee(sc->sc_curchan.channel, ieee80211_mhz2ieee(sc->sc_curchan.channel,
sc->sc_curchan.channelFlags), sc->sc_curchan.channelFlags),
tv.tv_sec, tv.tv_usec); tv.tv_sec, (long)tv.tv_usec);
} }
sc->sc_dfs_cac = 0; sc->sc_dfs_cac = 0;
} }
@ -12132,7 +12132,7 @@ ath_radar_detected(struct ath_softc *sc, const char *cause)
"ichan=%3d (%4d MHz), ichan.icflags=0x%08X " "ichan=%3d (%4d MHz), ichan.icflags=0x%08X "
"-- Time: %ld.%06ld\n", "-- Time: %ld.%06ld\n",
ichan.ic_ieee, ichan.ic_freq, ichan.ic_flags, ichan.ic_ieee, ichan.ic_freq, ichan.ic_flags,
tv.tv_sec, tv.tv_usec); tv.tv_sec, (long)tv.tv_usec);
/* Mark the channel */ /* Mark the channel */
sc->sc_curchan.privFlags &= ~CHANNEL_DFS_CLEAR; sc->sc_curchan.privFlags &= ~CHANNEL_DFS_CLEAR;
sc->sc_curchan.privFlags |= CHANNEL_INTERFERENCE; sc->sc_curchan.privFlags |= CHANNEL_INTERFERENCE;