staging: brcm80211: move fullmac-only code from osl to fullmac files

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
index 2fa77cb53040fd3b33db136ff4e6d63b2e112f8e..b3fc2a3eb9574b7eb4f12715ea40d55ba0999983 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
@@ -298,6 +298,15 @@ done:
        return ret;
 }
 
+#define PKTSUMNEEDED(skb) \
+               (((struct sk_buff *)(skb))->ip_summed == CHECKSUM_PARTIAL)
+#define PKTSETSUMGOOD(skb, x) \
+               (((struct sk_buff *)(skb))->ip_summed = \
+               ((x) ? CHECKSUM_UNNECESSARY : CHECKSUM_NONE))
+
+/* PKTSETSUMNEEDED and PKTSUMGOOD are not possible because
+       skb->ip_summed is overloaded */
+
 int
 dhd_prot_iovar_op(dhd_pub_t *dhdp, const char *name,
                  void *params, int plen, void *arg, int len, bool set)

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 7f66d7a84b6e8930e5d110a4b938537a1c550ca8..a114deed31342aef3b46bce4a2da6b0f9c186433 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -1052,6 +1052,32 @@ int dhd_sendpkt(dhd_pub_t *dhdp, int ifidx, struct sk_buff *pktbuf)
        return ret;
 }
 
+static inline void *
+osl_pkt_frmnative(struct osl_info *osh, struct sk_buff *skb)
+{
+       struct sk_buff *nskb;
+
+       for (nskb = skb; nskb; nskb = nskb->next)
+               osh->pktalloced++;
+
+       return (void *)skb;
+}
+#define PKTFRMNATIVE(osh, skb) \
+       osl_pkt_frmnative((osh), (struct sk_buff *)(skb))
+
+static inline struct sk_buff *
+osl_pkt_tonative(struct osl_info *osh, void *pkt)
+{
+       struct sk_buff *nskb;
+
+       for (nskb = (struct sk_buff *)pkt; nskb; nskb = nskb->next)
+               osh->pktalloced--;
+
+       return (struct sk_buff *)pkt;
+}
+#define PKTTONATIVE(osh, pkt)  \
+       osl_pkt_tonative((osh), (pkt))
+
 static int dhd_start_xmit(struct sk_buff *skb, struct net_device *net)
 {
        int ret;

diff --git a/drivers/staging/brcm80211/include/osl.h b/drivers/staging/brcm80211/include/osl.h
index f722db59173e1889d452b9c9994ae8519694fd2d..4e7d07e3878290096d64014a75957301ba3dce8e 100644 (file)
--- a/drivers/staging/brcm80211/include/osl.h
+++ b/drivers/staging/brcm80211/include/osl.h
@@ -249,43 +249,6 @@ extern void osl_dma_unmap(struct osl_info *osh, uint pa, uint size,
 extern void *osl_pktget(struct osl_info *osh, uint len);
 extern void osl_pktfree(struct osl_info *osh, void *skb, bool send);
 
-#ifdef BRCM_FULLMAC
-static inline void *
-osl_pkt_frmnative(struct osl_info *osh, struct sk_buff *skb)
-{
-       struct sk_buff *nskb;
-
-       for (nskb = skb; nskb; nskb = nskb->next)
-               osh->pktalloced++;
-
-       return (void *)skb;
-}
-#define PKTFRMNATIVE(osh, skb) \
-       osl_pkt_frmnative((osh), (struct sk_buff *)(skb))
-
-static inline struct sk_buff *
-osl_pkt_tonative(struct osl_info *osh, void *pkt)
-{
-       struct sk_buff *nskb;
-
-       for (nskb = (struct sk_buff *)pkt; nskb; nskb = nskb->next)
-               osh->pktalloced--;
-
-       return (struct sk_buff *)pkt;
-}
-#define PKTTONATIVE(osh, pkt)  \
-       osl_pkt_tonative((osh), (pkt))
-#endif /* BRCM_FULLMAC */
-
-#define PKTSUMNEEDED(skb) \
-               (((struct sk_buff *)(skb))->ip_summed == CHECKSUM_PARTIAL)
-#define PKTSETSUMGOOD(skb, x) \
-               (((struct sk_buff *)(skb))->ip_summed = \
-                       ((x) ? CHECKSUM_UNNECESSARY : CHECKSUM_NONE))
-/* PKTSETSUMNEEDED and PKTSUMGOOD are not possible because
-       skb->ip_summed is overloaded */
-
-
 #define        SET_REG(osh, r, mask, val) \
                W_REG((osh), (r), ((R_REG((osh), r) & ~(mask)) | (val)))