staging: brcm80211: Remove unused PKTFREESETCB

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

diff --git a/drivers/staging/brcm80211/include/linux_osl.h b/drivers/staging/brcm80211/include/linux_osl.h
index 18bc1f0d2d849aee526081b96dbe6c1216bace25..0e2e53e623cfb80eb728e2777442a5f8023d2de7 100644 (file)
--- a/drivers/staging/brcm80211/include/linux_osl.h
+++ b/drivers/staging/brcm80211/include/linux_osl.h
@@ -47,12 +47,6 @@ extern void osl_assert(char *exp, char *file, int line);
 extern uint osl_pci_bus(struct osl_info *osh);
 extern uint osl_pci_slot(struct osl_info *osh);
 
-#define PKTFREESETCB(osh, _tx_fn, _tx_ctx)                     \
-       do {                                                    \
-               ((struct osl_pubinfo *)osh)->tx_fn = _tx_fn;            \
-               ((struct osl_pubinfo *)osh)->tx_ctx = _tx_ctx;  \
-       } while (0)
-
 #define BUS_SWAP32(v)          (v)
 
 extern void *osl_dma_alloc_consistent(struct osl_info *osh, uint size,

diff --git a/drivers/staging/brcm80211/include/osl.h b/drivers/staging/brcm80211/include/osl.h
index 4d0ce97055008c4701c881ae3aabe22cdd2e6efc..186bb77b7623532610717b547308094ebcd68ee4 100644 (file)
--- a/drivers/staging/brcm80211/include/osl.h
+++ b/drivers/staging/brcm80211/include/osl.h
@@ -17,15 +17,9 @@
 #ifndef _osl_h_
 #define _osl_h_
 
-/* 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);
-
 struct osl_pubinfo {
        uint pktalloced;        /* Number of allocated packet buffers */
        bool mmbus;             /* Bus supports memory-mapped registers */
-       pktfree_cb_fn_t tx_fn;  /* Callback function for PKTFREE */
-       void *tx_ctx;           /* Context to the callback function */
 };
 
 /* osl handle type forward declaration */

diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c
index a0f9dcb0b786ed7bf44221a68faa2214a13e2e33..260995e0e90e3f9826839eae3c663c6f8ce081cb 100644 (file)
--- a/drivers/staging/brcm80211/util/linux_osl.c
+++ b/drivers/staging/brcm80211/util/linux_osl.c
@@ -103,9 +103,6 @@ void BCMFASTPATH osl_pktfree(struct osl_info *osh, void *p, bool send)
        skb = (struct sk_buff *)p;
        ASSERT(skb);
 
-       if (send && osh->pub.tx_fn)
-               osh->pub.tx_fn(osh->pub.tx_ctx, p, 0);
-
        /* perversion: we use skb->next to chain multi-skb packets */
        while (skb) {
                nskb = skb->next;