[PATCH 2/5] Staging: brcmfmac: Fix MAC header lookup on 64-bit architectures

Ben Hutchings ben at decadent.org.uk
Sun Nov 7 17:20:37 UTC 2010


Fix direct use of sk_buff::mac_header which is an offset rather
than a pointer on 64-bit architectures.

Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
Compile-tested only.  This should be 2.6.37 material.

Ben.

 drivers/staging/brcm80211/brcmfmac/dhd_linux.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index e535787..4218f87 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -1190,7 +1190,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]);
-- 
1.7.2.3






More information about the devel mailing list