--- a/net80211/ieee80211_monitor.c (revision 3272)
+++ b/net80211/ieee80211_monitor.c (revision 3337)
@@ -129,6 +129,6 @@
 ieee80211_monitor_encap(struct ieee80211vap *vap, struct sk_buff *skb)
 {
-	struct ieee80211_phy_params *ph =
-		(struct ieee80211_phy_params *) (SKB_CB(skb) + sizeof(struct ieee80211_cb));
+	struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *)
+		(SKB_CB(skb) + 1); /* NB: SKB_CB casts to CB struct*. */
 	SKB_CB(skb)->flags = M_RAW;
 	SKB_CB(skb)->ni = NULL;
--- a/THANKS (revision 3224)
+++ b/THANKS (revision 3337)
@@ -130,4 +130,5 @@
 Benoit Papillault
 Russell Harmon
+Alessandro Erta
 
 Apologies to anyone whose name was unintentionally left off.
--- a/ath/if_ath.c (revision 3334)
+++ b/ath/if_ath.c (revision 3337)
@@ -2860,5 +2860,5 @@
 	struct ath_hal *ah = sc->sc_ah;
 	struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *)
-		(SKB_CB(skb) + sizeof(struct ieee80211_cb));
+		(SKB_CB(skb) + 1); /* NB: SKB_CB casts to CB struct*. */
 	const HAL_RATE_TABLE *rt;
 	unsigned int pktlen, hdrlen, try0, power;