staging: brcm80211: Remove pkttag from osl

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

diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
index 59eaf71..be33696 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
@@ -188,7 +188,7 @@ int bcmsdh_probe(struct device *dev)
        }
 #endif                         /* defined(OOB_INTR_ONLY) */
        /* allocate SDIO Host Controller state info */
-       osh = osl_attach(dev, PCI_BUS, false);
+       osh = osl_attach(dev, PCI_BUS);
        if (!osh) {
                SDLX_MSG(("%s: osl_attach failed\n", __func__));
                goto err;
@@ -384,7 +384,7 @@ bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
                SDLX_MSG(("%s: Disabling TI FlashMedia Controller.\n",
                          __func__));
-               osh = osl_attach(pdev, PCI_BUS, false);
+               osh = osl_attach(pdev, PCI_BUS);
                if (!osh) {
                        SDLX_MSG(("%s: osl_attach failed\n", __func__));
                        goto err;
@@ -419,7 +419,7 @@ bcmsdh_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         */
 
        /* allocate SDIO Host Controller state info */
-       osh = osl_attach(pdev, PCI_BUS, false);
+       osh = osl_attach(pdev, PCI_BUS);
        if (!osh) {
                SDLX_MSG(("%s: osl_attach failed\n", __func__));
                goto err;

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index ba6fdc6..794dc13 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -1865,7 +1865,7 @@ static int dhd_open(struct net_device *net)
 
 osl_t *dhd_osl_attach(void *pdev, uint bustype)
 {
-       return osl_attach(pdev, bustype, true);
+       return osl_attach(pdev, bustype);
 }
 
 void dhd_osl_detach(osl_t *osh)

diff --git a/drivers/staging/brcm80211/include/linux_osl.h b/drivers/staging/brcm80211/include/linux_osl.h
index c398f79..586e652 100644 (file)
--- a/drivers/staging/brcm80211/include/linux_osl.h
+++ b/drivers/staging/brcm80211/include/linux_osl.h
@@ -18,7 +18,7 @@
 #define _linux_osl_h_
 
 
-extern osl_t *osl_attach(void *pdev, uint bustype, bool pkttag);
+extern osl_t *osl_attach(void *pdev, uint bustype);
 extern void osl_detach(osl_t *osh);
 
 extern u32 g_assert_type;
@@ -56,7 +56,6 @@ extern uint osl_pci_slot(osl_t *osh);
 
 /* Pkttag flag should be part of public information */
 typedef struct {
-       bool pkttag;
        uint pktalloced;        /* Number of allocated packet buffers */
        bool mmbus;             /* Bus supports memory-mapped register accesses */
        pktfree_cb_fn_t tx_fn;  /* Callback function for PKTFREE */
@@ -285,7 +284,6 @@ extern void osl_dma_unmap(osl_t *osh, uint pa, uint size, int direction);
 #define        PKTSETLEN(skb, len)     __skb_trim((struct sk_buff *)(skb), (len))
 #define        PKTPUSH(skb, bytes)     skb_push((struct sk_buff *)(skb), (bytes))
 #define        PKTPULL(skb, bytes)     skb_pull((struct sk_buff *)(skb), (bytes))
-#define        PKTTAG(skb)             ((void *)(((struct sk_buff *)(skb))->cb))
 #define PKTALLOCED(osh)                (((osl_pubinfo_t *)(osh))->pktalloced)
 #define PKTSETPOOL(osh, skb, x, y)     do {} while (0)
 #define PKTPOOL(osh, skb)              false
@@ -301,9 +299,6 @@ osl_pkt_frmnative(osl_pubinfo_t *osh, struct sk_buff *skb)
 {
        struct sk_buff *nskb;
 
-       if (osh->pkttag)
-               bzero((void *)skb->cb, OSL_PKTTAG_SZ);
-
        for (nskb = skb; nskb; nskb = nskb->next)
                osh->pktalloced++;
 
@@ -317,9 +312,6 @@ osl_pkt_tonative(osl_pubinfo_t *osh, void *pkt)
 {
        struct sk_buff *nskb;
 
-       if (osh->pkttag)
-               bzero(((struct sk_buff *)pkt)->cb, OSL_PKTTAG_SZ);
-
        for (nskb = (struct sk_buff *)pkt; nskb; nskb = nskb->next)
                osh->pktalloced--;
 

diff --git a/drivers/staging/brcm80211/include/osl.h b/drivers/staging/brcm80211/include/osl.h
index c0ebb3d..bcb56aa 100644 (file)
--- a/drivers/staging/brcm80211/include/osl.h
+++ b/drivers/staging/brcm80211/include/osl.h
@@ -21,8 +21,6 @@
 typedef struct osl_info osl_t;
 typedef struct osl_dmainfo osldma_t;
 
-#define OSL_PKTTAG_SZ  32      /* Size of PktTag */
-
 /* Drivers use PKTFREESETCB to register a callback function when a packet is freed by OSL */
 typedef void (*pktfree_cb_fn_t) (void *ctx, void *pkt, unsigned int status);
 

diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c
index d951d33..cb5dba9 100644 (file)
--- a/drivers/staging/brcm80211/sys/wl_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wl_mac80211.c
@@ -789,8 +789,7 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs,
                return NULL;
        }
 
-       /* Requires pkttag feature */
-       osh = osl_attach(btparam, bustype, true);
+       osh = osl_attach(btparam, bustype);
        ASSERT(osh);
 
 #ifdef WLC_HIGH_ONLY

diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h
index a392436..f6ac5e9 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_pub.h
+++ b/drivers/staging/brcm80211/sys/wlc_pub.h
@@ -441,10 +441,6 @@ struct wlc_if;
 
 #define PROMISC_ENAB(wlc)      ((wlc)->promisc)
 
-extern void wlc_pkttag_info_move(wlc_pub_t *pub, void *pkt_from, void *pkt_to);
-
-#define WLPKTTAGSCB(p) (WLPKTTAG(p)->_scb)
-
 #define        WLC_PREC_COUNT          16      /* Max precedence level implemented */
 
 /* pri is PKTPRIO encoded in the packet. This maps the Packet priority to

diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c
index d6cca69..7211f8a 100644 (file)
--- a/drivers/staging/brcm80211/util/linux_osl.c
+++ b/drivers/staging/brcm80211/util/linux_osl.c
@@ -45,7 +45,7 @@ struct osl_info {
 /* Global ASSERT type flag */
 u32 g_assert_type;
 
-osl_t *osl_attach(void *pdev, uint bustype, bool pkttag)
+osl_t *osl_attach(void *pdev, uint bustype)
 {
        osl_t *osh;
 
@@ -56,7 +56,6 @@ osl_t *osl_attach(void *pdev, uint bustype, bool pkttag)
 
        osh->magic = OS_HANDLE_MAGIC;
        osh->pdev = pdev;
-       osh->pub.pkttag = pkttag;
        osh->bustype = bustype;
 
        switch (bustype) {
@@ -77,12 +76,6 @@ osl_t *osl_attach(void *pdev, uint bustype, bool pkttag)
                break;
        }
 
-#if defined(BCMDBG) && !defined(BRCM_FULLMAC)
-       if (pkttag) {
-               struct sk_buff *skb;
-               ASSERT(OSL_PKTTAG_SZ <= sizeof(skb->cb));
-       }
-#endif
        return osh;
 }
 
@@ -95,7 +88,6 @@ void osl_detach(osl_t *osh)
        kfree(osh);
 }
 
-/* Return a new packet. zero out pkttag */
 void *BCMFASTPATH osl_pktget(osl_t *osh, uint len)
 {
        struct sk_buff *skb;