| 1 | --- a/THANKS |
| 2 | +++ b/THANKS |
| 3 | @@ -129,6 +129,7 @@ Derek J Smithies |
| 4 | jhansen |
| 5 | Benoit Papillault |
| 6 | Russell Harmon |
| 7 | +Alessandro Erta |
| 8 | |
| 9 | Apologies to anyone whose name was unintentionally left off. |
| 10 | Please let us know if you think your name should be mentioned here! |
| 11 | --- a/ath/if_ath.c |
| 12 | +++ b/ath/if_ath.c |
| 13 | @@ -3147,7 +3147,7 @@ ath_tx_startraw(struct net_device *dev, |
| 14 | struct ath_softc *sc = dev->priv; |
| 15 | struct ath_hal *ah = sc->sc_ah; |
| 16 | struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *) |
| 17 | - (SKB_CB(skb) + sizeof(struct ieee80211_cb)); |
| 18 | + (SKB_CB(skb) + 1); /* NB: SKB_CB casts to CB struct*. */ |
| 19 | const HAL_RATE_TABLE *rt; |
| 20 | unsigned int pktlen, hdrlen, try0, power; |
| 21 | HAL_PKT_TYPE atype; |
| 22 | --- a/net80211/ieee80211_monitor.c |
| 23 | +++ b/net80211/ieee80211_monitor.c |
| 24 | @@ -128,8 +128,8 @@ struct ar5212_openbsd_desc { |
| 25 | void |
| 26 | ieee80211_monitor_encap(struct ieee80211vap *vap, struct sk_buff *skb) |
| 27 | { |
| 28 | - struct ieee80211_phy_params *ph = |
| 29 | - (struct ieee80211_phy_params *) (SKB_CB(skb) + sizeof(struct ieee80211_cb)); |
| 30 | + struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *) |
| 31 | + (SKB_CB(skb) + 1); /* NB: SKB_CB casts to CB struct*. */ |
| 32 | SKB_CB(skb)->flags = M_RAW; |
| 33 | SKB_CB(skb)->ni = NULL; |
| 34 | SKB_CB(skb)->next = NULL; |
| 35 | |