diff --git a/[refs] b/[refs] index c75356ac4c66..cab51446a447 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a9b48b3d3e0f373dc996efde56a5bff0944d8de +refs/heads/master: ec7957049668b4fcf755cd8a085cfe258d77fc9b diff --git a/trunk/drivers/staging/brcm80211/include/osl.h b/trunk/drivers/staging/brcm80211/include/osl.h index 2cea5c122c3a..f722db59173e 100644 --- a/trunk/drivers/staging/brcm80211/include/osl.h +++ b/trunk/drivers/staging/brcm80211/include/osl.h @@ -275,10 +275,6 @@ osl_pkt_tonative(struct osl_info *osh, void *pkt) } #define PKTTONATIVE(osh, pkt) \ osl_pkt_tonative((osh), (pkt)) -#else /* !BRCM_FULLMAC */ -#define PKTSETSKIPCT(osh, skb) -#define PKTCLRSKIPCT(osh, skb) -#define PKTSKIPCT(osh, skb) #endif /* BRCM_FULLMAC */ #define PKTSUMNEEDED(skb) \