From 84462b26d8223ab2022873f048f0f4f4e5d1fe77 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 7 Nov 2010 17:20:37 +0000
Subject: [PATCH] --- yaml --- r: 227967 b: refs/heads/master c:
 d4fcdc68564f49cbb4fdaf9b0ebfb5c3d02c81d3 h: refs/heads/master i:   227965:
 eddf0a626cfe13ce92011ecd2022db2a2002c413   227963:
 b99f6a8cecd3b5b6774f8e1f0ab95b401e5f0587   227959:
 a2cd6f1c5100064a436bd8b84f4e951626e63902   227951:
 0f7f439b455ce4a7eb1c538122443d6e143430aa   227935:
 cf2cd0bba19b0af3b51208a565477cedde036dc3   227903:
 61fb16549d4c6dbf56adf7773067a472301cb5a9   227839:
 4ee1a4f88c7910fafaec05711790cc64c0bd4f9f v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index aa80d505efda..93a44fcded28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69ec303a99ff68cfb5dbc6cefb043e53b6ba8945
+refs/heads/master: d4fcdc68564f49cbb4fdaf9b0ebfb5c3d02c81d3
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 794dc13cf1a5..d7ad3e44dd78 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -1189,7 +1189,7 @@ void dhd_rx_frame(dhd_pub_t *dhdp, int ifidx, void *pktbuf, int numpkt)
 		/* Process special event packets and then discard them */
 		if (ntoh16(skb->protocol) == ETHER_TYPE_BRCM)
 			dhd_wl_host_event(dhd, &ifidx,
-					  skb->mac_header,
+					  skb_mac_header(skb),
 					  &event, &data);
 
 		ASSERT(ifidx < DHD_MAX_IFS && dhd->iflist[ifidx]);