diff --git a/ath/if_ath.c b/ath/if_ath.c
index d7c41d3..5d61bbd 100644
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -9873,8 +9873,7 @@ ath_led_off(unsigned long arg)
 
 	ath_hal_gpioset(sc->sc_ah, sc->sc_ledpin, !sc->sc_ledon);
 	sc->sc_ledtimer.function = ath_led_done;
-	sc->sc_ledtimer.expires = jiffies + sc->sc_ledoff;
-	add_timer(&sc->sc_ledtimer);
+	mod_timer(&sc->sc_ledtimer, jiffies + sc->sc_ledoff);
 }
 
 /*
@@ -9888,8 +9887,7 @@ ath_led_blink(struct ath_softc *sc, int on, int off)
 	sc->sc_blinking = 1;
 	sc->sc_ledoff = off;
 	sc->sc_ledtimer.function = ath_led_off;
-	sc->sc_ledtimer.expires = jiffies + on;
-	add_timer(&sc->sc_ledtimer);
+	mod_timer(&sc->sc_ledtimer, jiffies + on);
 }
 
 static void
diff --git a/ath/if_athvar.h b/ath/if_athvar.h
index e32be5c..728a7c4 100644
--- a/ath/if_athvar.h
+++ b/ath/if_athvar.h
@@ -737,7 +737,7 @@ struct ath_softc {
 	u_int sc_ledpin;			/* GPIO pin for driving LED */
 	u_int sc_ledon;				/* pin setting for LED on */
 	u_int sc_ledidle;			/* idle polling interval */
-	long unsigned int sc_ledevent;		/* time of last LED event */
+	unsigned long sc_ledevent;		/* time of last LED event */
 	u_int8_t sc_rxrate;			/* current rx rate for LED */
 	u_int8_t sc_txrate;			/* current tx rate for LED */
 	u_int16_t sc_ledoff;			/* off time for current blink */
@@ -796,7 +796,7 @@ struct ath_softc {
 
 	int sc_beacon_cal;			/* use beacon timer for calibration */
 	long unsigned int sc_calinterval_sec;	/* current interval for calibration (in seconds) */
-	long unsigned int sc_lastcal;		/* last time the calibration was performed */
+	unsigned long sc_lastcal;		/* last time the calibration was performed */
 	struct timer_list sc_cal_ch;		/* calibration timer */
 	HAL_NODE_STATS sc_halstats;		/* station-mode rssi stats */
 
diff --git a/ath_rate/amrr/amrr.c b/ath_rate/amrr/amrr.c
index 8f049db..a23aeca 100644
--- a/ath_rate/amrr/amrr.c
+++ b/ath_rate/amrr/amrr.c
@@ -447,8 +447,7 @@ ath_ratectl(unsigned long data)
 	interval = ath_rateinterval;
 	if (ic->ic_opmode == IEEE80211_M_STA)
 		interval /= 2;
-	asc->timer.expires = jiffies + ((HZ * interval) / 1000);
-	add_timer(&asc->timer);
+	mod_timer(&asc->timer, jiffies + ((HZ * interval) / 1000));
 }
 
 static struct ath_ratectrl *
diff --git a/ath_rate/minstrel/minstrel.c b/ath_rate/minstrel/minstrel.c
index 326130d..ed308b1 100644
--- a/ath_rate/minstrel/minstrel.c
+++ b/ath_rate/minstrel/minstrel.c
@@ -809,8 +809,7 @@ ath_timer_function(unsigned long data)
 	if (timer == NULL)
 		DPRINTF(sc, "%s: timer is null - leave it\n", __func__);
 
-	timer->expires = jiffies + ((HZ * interval) / 1000);
-	add_timer(timer);
+	mod_timer(timer, jiffies + ((HZ * interval) / 1000));
 }
 
 static void
@@ -926,8 +925,7 @@ ath_rate_attach(struct ath_softc *sc)
 	osc->timer.function = ath_timer_function;
 	osc->timer.data = (unsigned long)osc;
 
-	osc->timer.expires = jiffies + HZ;
-	add_timer(&osc->timer);
+	mod_timer(&osc->timer, jiffies + HZ);
 
 	return &osc->arc;
 }
diff --git a/ath_rate/onoe/onoe.h b/ath_rate/onoe/onoe.h
index 6fa9919..9a800d3 100644
--- a/ath_rate/onoe/onoe.h
+++ b/ath_rate/onoe/onoe.h
@@ -53,17 +53,17 @@ struct onoe_node {
 	u_int on_tx_err; 		/* tx !ok pkt */
 	u_int on_tx_retr;		/* tx retry count */
 	int on_tx_upper; 		/* tx upper rate req cnt */
-	u_int8_t	on_tx_rix0; 		/* series 0 rate index */
-	u_int8_t	on_tx_try0; 		/* series 0 try count */
-	u_int8_t	on_tx_rate0;		/* series 0 h/w rate */
-	u_int8_t	on_tx_rate1;		/* series 1 h/w rate */
-	u_int8_t	on_tx_rate2;		/* series 2 h/w rate */
-	u_int8_t	on_tx_rate3;		/* series 3 h/w rate */
-	u_int8_t	on_tx_rate0sp;		/* series 0 short preamble h/w rate */
-	u_int8_t	on_tx_rate1sp;		/* series 1 short preamble h/w rate */
-	u_int8_t	on_tx_rate2sp;		/* series 2 short preamble h/w rate */
-	u_int8_t	on_tx_rate3sp;		/* series 3 short preamble h/w rate */
-	long unsigned int on_nextcheck;		/* time of next check for rate drop */
+	u_int8_t	on_tx_rix0; 	/* series 0 rate index */
+	u_int8_t	on_tx_try0; 	/* series 0 try count */
+	u_int8_t	on_tx_rate0;	/* series 0 h/w rate */
+	u_int8_t	on_tx_rate1;	/* series 1 h/w rate */
+	u_int8_t	on_tx_rate2;	/* series 2 h/w rate */
+	u_int8_t	on_tx_rate3;	/* series 3 h/w rate */
+	u_int8_t	on_tx_rate0sp;	/* series 0 short preamble h/w rate */
+	u_int8_t	on_tx_rate1sp;	/* series 1 short preamble h/w rate */
+	u_int8_t	on_tx_rate2sp;	/* series 2 short preamble h/w rate */
+	u_int8_t	on_tx_rate3sp;	/* series 3 short preamble h/w rate */
+	unsigned long on_nextcheck;	/* time of next check for rate drop */
 };
 #define	ATH_NODE_ONOE(an)	((struct onoe_node *)&an[1])
 #endif /* _DEV_ATH_RATE_ONOE_H */
diff --git a/ath_rate/sample/sample.c b/ath_rate/sample/sample.c
index 1e2a7a6..ae21096 100644
--- a/ath_rate/sample/sample.c
+++ b/ath_rate/sample/sample.c
@@ -1041,9 +1041,9 @@ proc_read_nodes(struct ieee80211vap *vap, const int size, char *buf, int space)
 
 			p += sprintf(p, "\t%u.%02u\t\t", t / a, (t * 100 / a) % 100);
 			if (sn->stats[size_bin][ndx].last_tx) {
-  				unsigned int d = jiffies - 
+  				unsigned long d = jiffies - 
 					sn->stats[size_bin][ndx].last_tx;
-				p += sprintf(p, "%u.%02u", d / HZ, d % HZ);
+				p += sprintf(p, "%lu.%02lu", d / HZ, d % HZ);
 			} else {
 				p += sprintf(p, "-");
 			}
diff --git a/ath_rate/sample/sample.h b/ath_rate/sample/sample.h
index d4c4620..103bda4 100644
--- a/ath_rate/sample/sample.h
+++ b/ath_rate/sample/sample.h
@@ -65,7 +65,7 @@ struct rate_stats {
 	int total_packets;
 	int packets_acked;
 	unsigned perfect_tx_time; 	/* transmit time for 0 retries */
-	unsigned long int last_tx;
+	unsigned long last_tx;
 };
 
 
@@ -91,7 +91,7 @@ struct sample_node {
 
 	int current_rate[NUM_PACKET_SIZE_BINS];
 	int packets_since_switch[NUM_PACKET_SIZE_BINS];
-	unsigned long int jiffies_since_switch[NUM_PACKET_SIZE_BINS];
+	unsigned long jiffies_since_switch[NUM_PACKET_SIZE_BINS];
 
 	int packets_since_sample[NUM_PACKET_SIZE_BINS];
 	unsigned sample_tt[NUM_PACKET_SIZE_BINS];
diff --git a/net80211/ieee80211_input.c b/net80211/ieee80211_input.c
index 270e89e..d39ae27 100644
--- a/net80211/ieee80211_input.c
+++ b/net80211/ieee80211_input.c
@@ -2902,9 +2902,8 @@ ieee80211_parse_csaie(struct ieee80211_node *ni, u_int8_t *frm,
 
 		vap->iv_csa_timer.function = ieee80211_doth_switch_channel_tmr;
 		vap->iv_csa_timer.data = (unsigned long)vap;
-		vap->iv_csa_timer.expires = jiffies + IEEE80211_TU_TO_JIFFIES(
-		    vap->iv_csa_count * ni->ni_intval + 10);
-		add_timer(&vap->iv_csa_timer);
+		mod_timer(&vap->iv_csa_timer, jiffies + IEEE80211_TU_TO_JIFFIES(
+			vap->iv_csa_count * ni->ni_intval + 10));
 	}
 
 	vap->iv_csa_jiffies = jiffies;
diff --git a/net80211/ieee80211_node.c b/net80211/ieee80211_node.c
index b474344..acaec53 100644
--- a/net80211/ieee80211_node.c
+++ b/net80211/ieee80211_node.c
@@ -133,8 +133,7 @@ ieee80211_node_attach(struct ieee80211com *ic)
 	init_timer(&ic->ic_inact);
 	ic->ic_inact.function = ieee80211_node_timeout;
 	ic->ic_inact.data = (unsigned long) ic;
-	ic->ic_inact.expires = jiffies + IEEE80211_INACT_WAIT * HZ;
-	add_timer(&ic->ic_inact);
+	mod_timer(&ic->ic_inact, jiffies + IEEE80211_INACT_WAIT * HZ);
 
 #ifdef IEEE80211_DEBUG_REFCNT
 	ic->ic_node_alloc_debug = node_alloc_debug;
@@ -1881,8 +1880,7 @@ ieee80211_node_timeout(unsigned long arg)
 	ieee80211_scan_timeout(ic);
 	ieee80211_timeout_stations(&ic->ic_sta);
 
-	ic->ic_inact.expires = jiffies + IEEE80211_INACT_WAIT * HZ;
-	add_timer(&ic->ic_inact);
+	mod_timer(&ic->ic_inact, jiffies + IEEE80211_INACT_WAIT * HZ);
 }
 
 void
diff --git a/net80211/ieee80211_node.h b/net80211/ieee80211_node.h
index e20886b..fa6d229 100644
--- a/net80211/ieee80211_node.h
+++ b/net80211/ieee80211_node.h
@@ -135,7 +135,7 @@ struct ieee80211_node {
 	u_int8_t ni_n_needed_chans;		/* size of ni_needed_chans list */
 	u_int16_t ni_txseqs[17];		/* tx seq per-tid */
 	u_int16_t ni_rxseqs[17];		/* rx seq previous per-tid*/
-	long unsigned int ni_rxfragstamp;	/* time stamp of last rx frag */
+	unsigned long ni_rxfragstamp;		/* time stamp of last rx frag */
 	struct sk_buff *ni_rxfrag;		/* rx frag reassembly */
 	struct ieee80211_rsnparms ni_rsn;	/* RSN/WPA parameters */
 	struct ieee80211_key ni_ucastkey;	/* unicast key */
@@ -143,7 +143,7 @@ struct ieee80211_node {
 
 	/* hardware */
 	u_int64_t ni_rtsf;			/* recv timestamp */
-	u_int32_t ni_last_rx;			/* recv jiffies */
+	unsigned long ni_last_rx;		/* recv jiffies */
 	u_int8_t ni_rssi;			/* recv ssi */
 
 	/* header */
diff --git a/net80211/ieee80211_var.h b/net80211/ieee80211_var.h
index ad1534f..1f9cbc4 100644
--- a/net80211/ieee80211_var.h
+++ b/net80211/ieee80211_var.h
@@ -229,7 +229,7 @@ struct ieee80211vap {
 	u_int iv_scanvalid;				/* scan cache valid threshold */
 	struct ieee80211_roam iv_roam;			/* sta-mode roaming state */
 
-	u_int32_t iv_csa_jiffies;			/* last csa recv jiffies */
+	unsigned long iv_csa_jiffies;			/* last csa recv jiffies */
 	u_int8_t iv_csa_count;				/* last csa count */
 	struct ieee80211_channel *iv_csa_chan;		/* last csa channel */
 	u_int8_t iv_csa_mode;				/* last csa mode */