--- a/THANKS
+++ b/THANKS
@@ -129,6 +129,7 @@ Derek J Smithies
 jhansen
 Benoit Papillault
 Russell Harmon
+Alessandro Erta
 
 Apologies to anyone whose name was unintentionally left off.
 Please let us know if you think your name should be mentioned here!
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -3147,7 +3147,7 @@ ath_tx_startraw(struct net_device *dev,
 	struct ath_softc *sc = dev->priv;
 	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;
 	HAL_PKT_TYPE atype;
--- a/net80211/ieee80211_monitor.c
+++ b/net80211/ieee80211_monitor.c
@@ -128,8 +128,8 @@ struct ar5212_openbsd_desc {
 void
 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;
 	SKB_CB(skb)->next = NULL;