diff --git a/drivers/net/wireless/adm8211/adm8211_hw.c b/drivers/net/wireless/adm8211/adm8211_hw.c
index 2ec950d..49d79cb 100644
--- a/drivers/net/wireless/adm8211/adm8211_hw.c
+++ b/drivers/net/wireless/adm8211/adm8211_hw.c
@@ -499,7 +499,7 @@
 		ieee->stats.rx_packets++;
 
 		skb->pkt_type = PACKET_OTHERHOST;
-		skb->mac.raw = skb->data;
+		skb_reset_mac_header(skb);
 
 		netif_rx(skb);
 		dev->last_rx = jiffies;
@@ -717,7 +717,7 @@
 #endif
 			stat->rssi = rssi;
 			stat->rate = rate;
-			skb->mac.raw = skb->data;
+			skb_reset_mac_header(skb);
 			skb->protocol = __constant_htons(ETH_P_802_2);
 			skb_queue_tail(&priv->rx_queue, skb);
 			tasklet_schedule(&priv->rx_tasklet);
@@ -2376,7 +2376,8 @@
 
 int adm8211_80211_header_parse(struct sk_buff *skb, unsigned char *haddr)
 {
-	memcpy(haddr, skb->mac.raw + 10 + sizeof(struct avs_caphdr), ETH_ALEN); /* addr2 */
+	memcpy(haddr, skb_mac_header(skb) + 10 + sizeof(struct avs_caphdr),
+		ETH_ALEN); /* addr2 */
 	return ETH_ALEN;
 }